Change scm.SVN.Capture

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 cStringIO
 import glob
 import os
 import re
@@ skipping 288 matching lines @@
         return (False, current_version)
       elif ver > min_ver:
         return (True, current_version)
     return (True, current_version)
 
 
 class SVN(object):
   current_version = None
 
   @staticmethod
-  def Capture(args, in_directory=None, print_error=True):
-    """Runs svn, capturing output sent to stdout as a string.
+  def Capture(args, **kwargs):
+    """Always redirect stderr.
 
-    Args:
-      args: A sequence of command line parameters to be passed to svn.
-      in_directory: The directory where svn is to be run.
-
-    Returns:
-      The output sent to stdout as a string.
-    """
-    stderr = None
-    if not print_error:
-      stderr = subprocess.PIPE
-    return gclient_utils.Popen(['svn'] + args, cwd=in_directory,
-        stdout=subprocess.PIPE, stderr=stderr).communicate()[0]
+    Throws an exception if non-0 is returned."""
+    return gclient_utils.CheckCall(['svn'] + args, print_error=False,
+        **kwargs)[0]
 
   @staticmethod
   def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
     """Runs svn checkout, update, or status, output to stdout.
 
     The first item in args must be either "checkout", "update", or "status".
 
     svn's stdout is parsed to collect a list of files checked out or updated.
     These files are appended to file_list.  svn's stdout is also printed to
     sys.stdout as in Run.
@@ skipping 84 matching lines @@
           if len(file_list) == previous_list_len and not IsKnownFailure():
             # No known svn error was found and no progress, bail out.
             raise
         print "Sleeping %.1f seconds and retrying...." % backoff_time
         time.sleep(backoff_time)
         backoff_time *= 1.3
         continue
       break
 
   @staticmethod
-  def CaptureInfo(relpath, in_directory=None, print_error=True):
+  def CaptureInfo(cwd):
     """Returns a dictionary from the svn info output for the given file.
 
-    Args:
-      relpath: The directory where the working copy resides relative to
-        the directory given by in_directory.
-      in_directory: The directory where svn is to be run.
-    """
-    output = SVN.Capture(["info", "--xml", relpath], in_directory, print_error)
+    Throws an exception if svn info fails."""
+    output = SVN.Capture(['info', '--xml', cwd])
     dom = gclient_utils.ParseXML(output)
     result = {}
     if dom:
       GetNamedNodeText = gclient_utils.GetNamedNodeText
       GetNodeNamedAttributeText = gclient_utils.GetNodeNamedAttributeText
       def C(item, f):
         if item is not None:
           return f(item)
       # /info/entry/
       #   url
@@ skipping 14 matching lines @@
       # Differs across versions.
       if result['Node Kind'] == 'dir':
         result['Node Kind'] = 'directory'
       result['Schedule'] = C(GetNamedNodeText(dom, 'schedule'), str)
       result['Path'] = C(GetNodeNamedAttributeText(dom, 'entry', 'path'), str)
       result['Copied From URL'] = C(GetNamedNodeText(dom, 'copy-from-url'), str)
       result['Copied From Rev'] = C(GetNamedNodeText(dom, 'copy-from-rev'), str)
     return result
 
   @staticmethod
-  def CaptureHeadRevision(url):
-    """Get the head revision of a SVN repository.
-
-    Returns:
-      Int head revision
-    """
-    info = SVN.Capture(["info", "--xml", url], os.getcwd())
-    dom = xml.dom.minidom.parseString(info)
-    return dom.getElementsByTagName('entry')[0].getAttribute('revision')
-
-  @staticmethod
-  def CaptureBaseRevision(cwd):
+  def CaptureRevision(cwd):
     """Get the base revision of a SVN repository.
 
     Returns:
       Int base revision
     """
-    info = SVN.Capture(["info", "--xml"], cwd)
+    info = SVN.Capture(['info', '--xml'], cwd=cwd)
     dom = xml.dom.minidom.parseString(info)
     return dom.getElementsByTagName('entry')[0].getAttribute('revision')
 
   @staticmethod
   def CaptureStatus(files):
     """Returns the svn 1.5 svn status emulated output.
 
     @files can be a string (one file) or a list of files.
 
     Returns an array of (status, file) tuples."""
@@ skipping 33 matching lines @@
           file_path = entry.getAttribute('path')
           wc_status = entry.getElementsByTagName('wc-status')
           assert len(wc_status) == 1
           # Emulate svn 1.5 status ouput...
           statuses = [' '] * 7
           # Col 0
           xml_item_status = wc_status[0].getAttribute('item')
           if xml_item_status in status_letter:
             statuses[0] = status_letter[xml_item_status]
           else:
-            raise Exception('Unknown item status "%s"; please implement me!' %
-                            xml_item_status)
+            raise gclient_utils.Error(
+                'Unknown item status "%s"; please implement me!' %
+                    xml_item_status)
           # Col 1
           xml_props_status = wc_status[0].getAttribute('props')
           if xml_props_status == 'modified':
             statuses[1] = 'M'
           elif xml_props_status == 'conflicted':
             statuses[1] = 'C'
           elif (not xml_props_status or xml_props_status == 'none' or
                 xml_props_status == 'normal'):
             pass
           else:
-            raise Exception('Unknown props status "%s"; please implement me!' %
-                            xml_props_status)
+            raise gclient_utils.Error(
+                'Unknown props status "%s"; please implement me!' %
+                    xml_props_status)
           # Col 2
           if wc_status[0].getAttribute('wc-locked') == 'true':
             statuses[2] = 'L'
           # Col 3
           if wc_status[0].getAttribute('copied') == 'true':
             statuses[3] = '+'
           # Col 4
           if wc_status[0].getAttribute('switched') == 'true':
             statuses[4] = 'S'
           # TODO(maruel): Col 5 and 6
@@ skipping 19 matching lines @@
 
     Args:
       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.
     """
-    output = SVN.Capture(["propget", property_name, filename])
-    if (output.startswith("svn: ") and
-        output.endswith("is not under version control")):
-      return ""
-    else:
-      return output
+    try:
+      return SVN.Capture(['propget', property_name, filename])
+    except gclient_utils.Error:
+      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
     files, usually in the prospect to apply the patch for a try job."""
@@ skipping 44 matching lines @@
               data.write(GenFakeDiff(os.path.join(dirpath, f)))
           if data:
             tmp = data.getvalue()
             data.close()
             data = tmp
         else:
           data = GenFakeDiff(filename)
       else:
         if info.get("Node Kind") != "directory":
           # svn diff on a mv/cp'd file outputs nothing if there was no change.
-          data = SVN.Capture(command, None)
+          data = SVN.Capture(command)
           if not data:
             # We put in an empty Index entry so upload.py knows about them.
             data = "Index: %s\n" % filename.replace(os.sep, '/')
         # Otherwise silently ignore directories.
     else:
       if info.get("Node Kind") != "directory":
         # Normal simple case.
-        data = SVN.Capture(command, None)
+        data = SVN.Capture(command)
       # Otherwise silently ignore directories.
     return data
 
   @staticmethod
   def GenerateDiff(filenames, root=None, full_move=False, revision=None):
     """Returns a string containing the diff for the given file list.
 
     The files in the list should either be absolute paths or relative to the
     given root. If no root directory is provided, the repository root will be
     used.
@@ skipping 70 matching lines @@
       result = buf.getvalue()
       buf.close()
       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."""
-    infos = SVN.CaptureInfo(repo_root)
-    uuid = infos.get('UUID')
-    root = infos.get('Repository Root')
-    if not root:
+    try:
+      infos = SVN.CaptureInfo(repo_root)
+    except gclient_utils.Error:
       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))
     if regexp is None:
       return None
     if sys.platform.startswith('win'):
       if not 'APPDATA' in os.environ:
         return None
       auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
@@ skipping 31 matching lines @@
       values[key] = value
     return values
 
   @staticmethod
   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)
-    infos = SVN.CaptureInfo(directory, print_error=False)
-    cur_dir_repo_root = infos.get("Repository Root")
-    if not cur_dir_repo_root:
+    try:
+      cur_dir_repo_root = SVN.CaptureInfo(directory)['Repository Root']
+    except gclient_utils.Error:
       return None
-
     while True:
       parent = os.path.dirname(directory)
-      if (SVN.CaptureInfo(parent, print_error=False).get(
-              "Repository Root") != cur_dir_repo_root):
+      try:
+        if SVN.CaptureInfo(parent)['Repository Root'] != cur_dir_repo_root:
+          break
+      except gclient_utils.Error:
         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)
       else:
         return 0
     if not SVN.current_version:
       SVN.current_version = SVN.Capture(['--version']).split()[2]
     current_version_list = map(only_int, SVN.current_version.split('.'))
     for min_ver in map(int, min_version.split('.')):
       ver = current_version_list.pop(0)
       if ver < min_ver:
         return (False, SVN.current_version)
       elif ver > min_ver:
         return (True, SVN.current_version)
     return (True, SVN.current_version)