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

scm.py

 # Copyright (c) 2010 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 cStringIO
 import glob
 import logging
 import os
 import re
 import shutil
 import subprocess
 import sys
 import tempfile
 import time
 import xml.dom.minidom
 
 import gclient_utils
+import subprocess2
+
 
 def ValidateEmail(email):
   return (re.match(r"^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", email)
           is not None)
 
 
 def GetCasedPath(path):
   """Elcheapos way to get the real path case on Windows."""
   if sys.platform.startswith('win') and os.path.exists(path):
     # Reconstruct the path.
@@ skipping 233 matching lines @@
   def FetchUpstreamTuple(cwd):
     """Returns a tuple containg remote and remote ref,
        e.g. 'origin', 'refs/heads/master'
        Tries to be intelligent and understand git-svn.
     """
     remote = '.'
     branch = GIT.GetBranch(cwd)
     try:
       upstream_branch = GIT.Capture(
           ['config', 'branch.%s.merge' % branch], cwd=cwd).strip()
-    except gclient_utils.Error:
+    except (gclient_utils.Error, subprocess2.CalledProcessError):
       upstream_branch = None
     if upstream_branch:
       try:
         remote = GIT.Capture(
             ['config', 'branch.%s.remote' % branch], cwd=cwd).strip()
-      except gclient_utils.Error:
+      except (gclient_utils.Error, subprocess2.CalledProcessError):
         pass
     else:
       try:
         upstream_branch = GIT.Capture(
             ['config', 'rietveld.upstream-branch'], cwd=cwd).strip()
-      except gclient_utils.Error:
+      except (gclient_utils.Error, subprocess2.CalledProcessError):
         upstream_branch = None
       if upstream_branch:
         try:
           remote = GIT.Capture(
               ['config', 'rietveld.upstream-remote'], cwd=cwd).strip()
-        except gclient_utils.Error:
+        except (gclient_utils.Error, subprocess2.CalledProcessError):
           pass
       else:
         # Fall back on trying a git-svn upstream branch.
         if GIT.IsGitSvn(cwd):
           upstream_branch = GIT.GetSVNBranch(cwd)
         else:
           # Else, try to guess the origin remote.
           remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split()
           if 'origin/master' in remote_branches:
             # Fall back on origin/master if it exits.
@@ skipping 150 matching lines @@
         if line.startswith('svn: '):
           failure.append(line)
 
       try:
         gclient_utils.CheckCallAndFilterAndHeader(
             ['svn'] + args,
             cwd=cwd,
             always=verbose,
             filter_fn=CaptureMatchingLines,
             stdout=stdout)
-      except gclient_utils.Error:
+      except (gclient_utils.Error, subprocess2.CalledProcessError):
         def IsKnownFailure():
           for x in failure:
             if (x.startswith('svn: OPTIONS of') or
                 x.startswith('svn: PROPFIND of') or
                 x.startswith('svn: REPORT of') or
                 x.startswith('svn: Unknown hostname') or
                 x.startswith('svn: Server sent unexpected return value')):
               return True
           return False
 
@@ skipping 179 matching lines @@
       filename: The file to check
       property_name: The name of the SVN property, e.g. "svn:mime-type"
 
     Returns:
       The value of the property, which will be the empty string if the property
       is not set on the file.  If the file is not under version control, the
       empty string is also returned.
     """
     try:
       return SVN.Capture(['propget', property_name, filename])
-    except gclient_utils.Error:
+    except (gclient_utils.Error, subprocess2.CalledProcessError):
       return ''
 
   @staticmethod
   def DiffItem(filename, full_move=False, revision=None):
     """Diffs a single file.
 
     Should be simple, eh? No it isn't.
     Be sure to be in the appropriate directory before calling to have the
     expected relative path.
     full_move means that move or copy operations should completely recreate the
@@ skipping 160 matching lines @@
       return result
     finally:
       os.chdir(previous_cwd)
       shutil.rmtree(bogus_dir)
 
   @staticmethod
   def GetEmail(repo_root):
     """Retrieves the svn account which we assume is an email address."""
     try:
       infos = SVN.CaptureInfo(repo_root)
-    except gclient_utils.Error:
+    except (gclient_utils.Error, subprocess2.CalledProcessError):
       return None
 
     # Should check for uuid but it is incorrectly saved for https creds.
     root = infos['Repository Root']
     realm = root.rsplit('/', 1)[0]
     uuid = infos['UUID']
     if root.startswith('https') or not uuid:
       regexp = re.compile(r'<%s:\d+>.*' % realm)
     else:
       regexp = re.compile(r'<%s:\d+> %s' % (realm, uuid))
@@ skipping 41 matching lines @@
   def GetCheckoutRoot(directory):
     """Returns the top level directory of the current repository.
 
     The directory is returned as an absolute path.
     """
     directory = os.path.abspath(directory)
     try:
       info = SVN.CaptureInfo(directory)
       cur_dir_repo_root = info['Repository Root']
       url = info['URL']
-    except gclient_utils.Error:
+    except (gclient_utils.Error, subprocess2.CalledProcessError):
       return None
     while True:
       parent = os.path.dirname(directory)
       try:
         info = SVN.CaptureInfo(parent)
         if (info['Repository Root'] != cur_dir_repo_root or
             info['URL'] != os.path.dirname(url)):
           break
         url = info['URL']
-      except gclient_utils.Error:
+      except (gclient_utils.Error, subprocess2.CalledProcessError):
         break
       directory = parent
     return GetCasedPath(directory)
 
   @staticmethod
   def AssertVersion(min_version):
     """Asserts svn's version is at least min_version."""
     def only_int(val):
       if val.isdigit():
         return int(val)
@@ skipping 51 matching lines @@
       if (file_status[0][0] in ('D', 'A', '!') or
           not file_status[0][1:].isspace()):
         # Added, deleted file requires manual intervention and require calling
         # revert, like for properties.
         try:
           SVN.Capture(['revert', file_status[1]], cwd=repo_root)
         except gclient_utils.CheckCallError:
           if not os.path.exists(file_path):
             continue
           raise