Revert 32057, 32058, 32059, 32062 because they still have unwanted side-effects.

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 groups files into
 changelists."""
 
 import getpass
 import os
 import random
 import re
 import shutil
 import string
 import subprocess
 import sys
 import tempfile
 import upload
 import urllib2
 
 # gcl now depends on gclient.
-from scm import SVN
+import gclient_scm
 import gclient_utils
 
-__version__ = '1.1.2'
+__version__ = '1.1.1'
 
 
 CODEREVIEW_SETTINGS = {
   # Default values.
   "CODE_REVIEW_SERVER": "codereview.chromium.org",
   "CC_LIST": "chromium-reviews@googlegroups.com",
   "VIEW_VC": "http://src.chromium.org/viewvc/chrome?view=rev&revision=",
 }
 
 # globals that store the root of the current repository and the directory where
 # we store information about changelists.
 REPOSITORY_ROOT = ""
 
 # Filename where we store repository specific information for gcl.
 CODEREVIEW_SETTINGS_FILE = "codereview.settings"
 
 # Warning message when the change appears to be missing tests.
 MISSING_TEST_MSG = "Change contains new or modified methods, but no new tests!"
 
 # Global cache of files cached in GetCacheDir().
 FILES_CACHE = {}
 
 
+### SVN Functions
+
+def IsSVNMoved(filename):
+  """Determine if a file has been added through svn mv"""
+  info = gclient_scm.CaptureSVNInfo(filename)
+  return (info.get('Copied From URL') and
+          info.get('Copied From Rev') and
+          info.get('Schedule') == 'add')
+
+
+def GetSVNFileProperty(file, property_name):
+  """Returns the value of an SVN property for the given file.
+
+  Args:
+    file: 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 = RunShell(["svn", "propget", property_name, file])
+  if (output.startswith("svn: ") and
+      output.endswith("is not under version control")):
+    return ""
+  else:
+    return output
+
+
 def UnknownFiles(extra_args):
   """Runs svn status and prints unknown files.
 
   Any args in |extra_args| are passed to the tool to support giving alternate
   code locations.
   """
-  return [item[1] for item in SVN.CaptureStatus(extra_args)
+  return [item[1] for item in gclient_scm.CaptureSVNStatus(extra_args)
           if item[0][0] == '?']
 
 
 def GetRepositoryRoot():
   """Returns the top level directory of the current repository.
 
   The directory is returned as an absolute path.
   """
   global REPOSITORY_ROOT
   if not REPOSITORY_ROOT:
-    infos = SVN.CaptureInfo(os.getcwd(), print_error=False)
+    infos = gclient_scm.CaptureSVNInfo(os.getcwd(), print_error=False)
     cur_dir_repo_root = infos.get("Repository Root")
     if not cur_dir_repo_root:
       raise gclient_utils.Error("gcl run outside of repository")
 
     REPOSITORY_ROOT = os.getcwd()
     while True:
       parent = os.path.dirname(REPOSITORY_ROOT)
-      if (SVN.CaptureInfo(parent, print_error=False).get(
+      if (gclient_scm.CaptureSVNInfo(parent, print_error=False).get(
               "Repository Root") != cur_dir_repo_root):
         break
       REPOSITORY_ROOT = parent
   return REPOSITORY_ROOT
 
 
 def GetInfoDir():
   """Returns the directory where gcl info files are stored."""
   return os.path.join(GetRepositoryRoot(), '.svn', 'gcl_info')
 
@@ skipping 24 matching lines @@
     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:
       return None
     if (not os.path.exists(cached_file) or
         os.stat(cached_file).st_mtime > max_age):
       local_dir = os.path.dirname(os.path.abspath(filename))
       local_base = os.path.basename(filename)
-      dir_info = SVN.CaptureInfo(".")
+      dir_info = gclient_scm.CaptureSVNInfo(".")
       repo_root = dir_info["Repository Root"]
       if use_root:
         url_path = repo_root
       else:
         url_path = dir_info["URL"]
       content = ""
       while True:
         # First, look for a locally modified version of the file if we can.
         r = ""
         if not use_root:
           local_path = os.path.join(local_dir, local_base)
-          r = SVN.CaptureStatus((local_path,))
+          r = gclient_scm.CaptureSVNStatus((local_path,))
         rc = -1
         if r:
           status = r[0][0]
           rc = 0
         if not rc and status[0] in ('A','M'):
           content = ReadFile(local_path)
           rc = 0
         else:
           # Look in the repository if we didn't find something local.
           svn_path = url_path + "/" + filename
@@ skipping 299 matching lines @@
     files = []
     for line in split_data[1].splitlines():
       status = line[:7]
       filename = line[7:]
       files.append((status, filename))
     description = split_data[2]
     save = False
     if update_status:
       for item in files:
         filename = os.path.join(local_root, item[1])
-        status_result = SVN.CaptureStatus(filename)
+        status_result = gclient_scm.CaptureSVNStatus(filename)
         if not status_result or not status_result[0][0]:
           # File has been reverted.
           save = True
           files.remove(item)
           continue
         status = status_result[0][0]
         if status != item[0]:
           save = True
           files[files.index(item)] = (status, item[1])
     change_info = ChangeInfo(changename, issue, patchset, description, files,
@@ skipping 63 matching lines @@
 
   # Get a list of all files in changelists.
   files_in_cl = {}
   for cl in GetCLs():
     change_info = ChangeInfo.Load(cl, GetRepositoryRoot(),
                                   fail_on_not_found=True, update_status=False)
     for status, filename in change_info.GetFiles():
       files_in_cl[filename] = change_info.name
 
   # Get all the modified files.
-  status_result = SVN.CaptureStatus(None)
+  status_result = gclient_scm.CaptureSVNStatus(None)
   for line in status_result:
     status = line[0]
     filename = line[1]
     if status[0] == "?":
       continue
     if dir_prefix:
       filename = os.path.join(dir_prefix, filename)
     change_list_name = ""
     if filename in files_in_cl:
       change_list_name = files_in_cl[filename]
@@ skipping 166 matching lines @@
   used.
   """
   previous_cwd = os.getcwd()
   if root is None:
     os.chdir(GetRepositoryRoot())
   else:
     os.chdir(root)
 
   diff = []
   for filename in files:
-    # TODO(maruel): Use SVN.DiffItem().
     # Use svn info output instead of os.path.isdir because the latter fails
     # when the file is deleted.
-    if SVN.CaptureInfo(filename).get('Node Kind') == 'directory':
+    if gclient_scm.CaptureSVNInfo(filename).get("Node Kind") in ("dir",
+                                                                 "directory"):
       continue
     # If the user specified a custom diff command in their svn config file,
     # then it'll be used when we do svn diff, which we don't want to happen
     # since we want the unified diff.  Using --diff-cmd=diff doesn't always
     # work, since they can have another diff executable in their path that
     # gives different line endings.  So we use a bogus temp directory as the
     # config directory, which gets around these problems.
     if sys.platform.startswith("win"):
       parent_dir = tempfile.gettempdir()
     else:
       parent_dir = sys.path[0]  # tempdir is not secure.
     bogus_dir = os.path.join(parent_dir, "temp_svn_config")
     if not os.path.exists(bogus_dir):
       os.mkdir(bogus_dir)
     output = RunShell(["svn", "diff", "--config-dir", bogus_dir, filename])
     if output:
       diff.append(output)
-    elif SVN.IsMoved(filename):
+    elif IsSVNMoved(filename):
       #  svn diff on a mv/cp'd file outputs nothing.
       # We put in an empty Index entry so upload.py knows about them.
       diff.append("\nIndex: %s\n" % filename)
     else:
       # The file is not modified anymore. It should be removed from the set.
       pass
   os.chdir(previous_cwd)
   return "".join(diff)
 
 
@@ skipping 205 matching lines @@
         change_info.description += "\nCommitted: " + viewvc_url + revision
       change_info.CloseIssue()
   os.chdir(previous_cwd)
 
 
 def Change(change_info, args):
   """Creates/edits a changelist."""
   silent = FilterFlag(args, "--silent")
 
   # Verify the user is running the change command from a read-write checkout.
-  svn_info = SVN.CaptureInfo('.')
+  svn_info = gclient_scm.CaptureSVNInfo('.')
   if not svn_info:
     ErrorExit("Current checkout is unversioned.  Please retry with a versioned "
               "directory.")
 
   if (len(args) == 1):
     filename = args[0]
     f = open(filename, 'rU')
     override_description = f.read()
     f.close()
   else:
     override_description = None
-
+      
   if change_info.issue:
     try:
       description = GetIssueDescription(change_info.issue)
     except urllib2.HTTPError, err:
       if err.code == 404:
         # The user deleted the issue in Rietveld, so forget the old issue id.
         description = change_info.description
         change_info.issue = 0
         change_info.Save()
       else:
@@ skipping 272 matching lines @@
       return 0
     args =["svn", command]
     root = GetRepositoryRoot()
     args.extend([os.path.join(root, x) for x in change_info.GetFileNames()])
     RunShell(args, True)
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())