Deprecate gcl.GetSVNFileInfo() for gclient.CaptureSVNInfo().

presubmit.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.
 
 """Enables directory-specific presubmit checks to run at upload and/or commit.
 """
 
 __version__ = '1.0.1'
 
@@ skipping 14 matching lines @@
 import subprocess  # Exposed through the API.
 import sys  # Parts exposed through API.
 import tempfile  # Exposed through the API.
 import types
 import urllib2  # Exposed through the API.
 
 # Local imports.
 # TODO(joi) Would be cleaner to factor out utils in gcl to separate module, but
 # for now it would only be a couple of functions so hardly worth it.
 import gcl
+import gclient
 import presubmit_canned_checks
 
 
 # Matches key/value (or "tag") lines in changelist descriptions.
 _tag_line_re = re.compile(
     '^\s*(?P<key>[A-Z][A-Z_0-9]*)\s*=\s*(?P<value>.*?)\s*$')
 
 
 # Friendly names may be used for certain keys.  All values for key-value pairs
 # in change descriptions (like BUG=123) can be retrieved from a change object
@@ skipping 155 matching lines @@
 
     Args:
       Depot path as a string.
 
     Returns:
       The local path of the depot path under the user's current client, or None
       if the file is not mapped.
 
       Remember to check for the None case and show an appropriate error!
     """
-    local_path = gcl.GetSVNFileInfo(depot_path).get('Path')
+    local_path = gclient.CaptureSVNInfo(depot_path).get('Path')
     if not local_path:
       return None
     else:
       return local_path
 
   @staticmethod
   def LocalToDepotPath(local_path):
     """Translate a local path to a depot path.
 
     Args:
       Local path (relative to current directory, or absolute) as a string.
 
     Returns:
       The depot path (SVN URL) of the file if mapped, otherwise None.
     """
-    depot_path = gcl.GetSVNFileInfo(local_path).get('URL')
+    depot_path = gclient.CaptureSVNInfo(local_path).get('URL')
     if not depot_path:
       return None
     else:
       return depot_path
 
   @staticmethod
   def FilterTextFiles(affected_files, include_deletes=True):
     """Filters out all except text files and optionally also filters out
     deleted files.
 
@@ skipping 87 matching lines @@
   def __init__(self, path, action, repository_root=''):
     self.path = path
     self.action = action.strip()
     self.repository_root = repository_root
 
   def ServerPath(self):
     """Returns a path string that identifies the file in the SCM system.
 
     Returns the empty string if the file does not exist in SCM.
     """
-    return gcl.GetSVNFileInfo(self.AbsoluteLocalPath()).get('URL', '')
+    return gclient.CaptureSVNInfo(self.AbsoluteLocalPath()).get('URL', '')
 
   def LocalPath(self):
     """Returns the path of this file on the local disk relative to client root.
     """
     return normpath(self.path)
 
   def AbsoluteLocalPath(self):
     """Returns the absolute path of this file on the local disk.
     """
     return normpath(os.path.join(self.repository_root, self.LocalPath()))
 
   def IsDirectory(self):
     """Returns true if this object is a directory."""
     if os.path.exists(self.path):
       # Retrieve directly from the file system; it is much faster than querying
       # subversion, especially on Windows.
       return os.path.isdir(self.path)
     else:
-      return gcl.GetSVNFileInfo(self.path).get('Node Kind') == 'directory'
+      return gclient.CaptureSVNInfo(self.path).get('Node Kind') in ('dir',
+                                                                    'directory')
 
   def SvnProperty(self, property_name):
     """Returns the specified SVN property of this file, or the empty string
     if no such property.
     """
     return gcl.GetSVNFileProperty(self.AbsoluteLocalPath(), property_name)
 
   def Action(self):
     """Returns the action on this opened file, e.g. A, M, D, etc."""
     return self.action
@@ skipping 336 matching lines @@
     print "Found %d files." % len(files)
   return DoPresubmitChecks(gcl.ChangeInfo(name='temp', files=files),
                            options.commit,
                            options.verbose,
                            sys.stdout,
                            sys.stdin)
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv))