First pass to transition away for gclient_utils.Error and gclient_utils.CheckedCallError.

gcl.py

 #!/usr/bin/env python
 # 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.
 
 """\
 Wrapper script around Rietveld's upload.py that simplifies working with groups
 of files.
 """
 
@@ skipping 21 matching lines @@
     import simplejson as json  # pylint: disable=F0401
 
 import breakpad  # pylint: disable=W0611
 
 # gcl now depends on gclient.
 from scm import SVN
 
 import fix_encoding
 import gclient_utils
 import presubmit_support
+import subprocess2
 
 __version__ = '1.2'
 
 
 CODEREVIEW_SETTINGS = {
   # To make gcl send reviews to a server, check in a file named
   # "codereview.settings" (see |CODEREVIEW_SETTINGS_FILE| below) to your
   # project's base directory and add the following line to codereview.settings:
   # CODE_REVIEW_SERVER: codereview.yourserver.org
 }
@@ skipping 77 matching lines @@
 
   Note: The cache will be inconsistent if the same file is retrieved with both
         use_root=True and use_root=False. Don't be stupid.
   """
   if filename not in FILES_CACHE:
     # Don't try to look up twice.
     FILES_CACHE[filename] = None
     # First we check if we have a cached version.
     try:
       cached_file = os.path.join(GetCacheDir(), filename)
-    except gclient_utils.Error:
+    except (gclient_utils.Error, subprocess2.CalledProcessError):
       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']
       while True:
@@ skipping 11 matching lines @@
               # MacOSX 10.5.2 has a bug with svn 1.4.4 that will trigger the
               # 'Can\'t get username or password' and can be fixed easily.
               # The fix doesn't work if the user upgraded to svn 1.6.x. Bleh.
               # I don't have time to fix their broken stuff.
               args.append('--non-interactive')
             gclient_utils.CheckCallAndFilter(
                 args, cwd='.', filter_fn=content_array.append)
             # Exit the loop if the file was found. Override content.
             content = '\n'.join(content_array)
             break
-          except gclient_utils.Error:
+          except (gclient_utils.Error, subprocess2.CalledProcessError):
             if content_array[0].startswith(
                 'svn: Can\'t get username or password'):
               ErrorExit('Your svn credentials expired. Please run svn update '
                         'to fix the cached credentials')
             if content_array[0].startswith('svn: Can\'t get password'):
               ErrorExit('If are using a Mac and svn --version shows 1.4.x, '
                   'please hack gcl.py to remove --non-interactive usage, it\'s'
                   'a bug on your installed copy')
             if (content_array[0].startswith('svn: File not found:') or
                 content_array[0].endswith('path not found')):
@@ skipping 1230 matching lines @@
         '\nYour python version is unsupported, please upgrade.\n')
   if not argv:
     argv = ['help']
   command = Command(argv[0])
   # Help can be run from anywhere.
   if command == CMDhelp:
     return command(argv[1:])
 
   try:
     GetRepositoryRoot()
-  except gclient_utils.Error:
+  except (gclient_utils.Error, subprocess2.CalledProcessError):
     print >> sys.stderr, 'To use gcl, you need to be in a subversion checkout.'
     return 1
 
   # Create the directories where we store information about changelists if it
   # doesn't exist.
   try:
     if not os.path.exists(GetInfoDir()):
       os.mkdir(GetInfoDir())
     if not os.path.exists(GetChangesDir()):
       os.mkdir(GetChangesDir())
     if not os.path.exists(GetCacheDir()):
       os.mkdir(GetCacheDir())
 
     if command:
       return command(argv[1:])
     # Unknown command, try to pass that to svn
     return CMDpassthru(argv)
-  except gclient_utils.Error, e:
+  except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, 'Got an exception'
     print >> sys.stderr, str(e)
     return 1
   except upload.ClientLoginError, e:
     print >> sys.stderr, 'Got an exception logging in to Rietveld'
     print >> sys.stderr, str(e)
   except urllib2.HTTPError, e:
     if e.code != 500:
       raise
     print >> sys.stderr, (
         'AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
         'and retry or visit go/isgaeup.\n%s') % (e.code, str(e))
     return 1
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))