Reapply 32057, 32058, 32059, 32062 and fixes problems introduced by these changes.

trychange.py

 #!/usr/bin/python
 # Copyright (c) 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.
 """Client-side script to send a try job to the try server. It communicates to
 the try server by either writting to a svn repository or by directly connecting
 to the server by HTTP.
 """
 
 
 import datetime
 import getpass
 import logging
 import optparse
 import os
 import shutil
 import socket
 import subprocess
 import sys
 import tempfile
 import urllib
 
 import gcl
-import gclient_scm
+import scm
 import presubmit_support
 import upload
 
-__version__ = '1.1.1'
+__version__ = '1.1.2'
 
 
 # Constants
 HELP_STRING = "Sorry, Tryserver is not available."
 USAGE = r"""%prog [change_name] [options]
 
 Client-side script to send a try job to the try server. It communicates to
 the try server by either writting to a svn repository or by directly connecting
 to the server by HTTP.
 
@@ skipping 104 matching lines @@
     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.
     """
     previous_cwd = os.getcwd()
     if root is None:
       os.chdir(gcl.GetRepositoryRoot())
     else:
       os.chdir(root)
 
-    diff = []
-    for filename in files:
-      # Use svn info output instead of os.path.isdir because the latter fails
-      # when the file is deleted.
-      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)
-      # Grabs the diff data.
-      data = gcl.RunShell(["svn", "diff", "--config-dir", bogus_dir, filename])
-
-      # We know the diff will be incorrectly formatted. Fix it.
-      if gcl.IsSVNMoved(filename):
-        # The file is "new" in the patch sense. Generate a homebrew diff.
-        # We can't use ReadFile() since it's not using binary mode.
-        file_handle = open(filename, 'rb')
-        file_content = file_handle.read()
-        file_handle.close()
-        # Prepend '+' to every lines.
-        file_content = ['+' + i for i in file_content.splitlines(True)]
-        nb_lines = len(file_content)
-        # We need to use / since patch on unix will fail otherwise.
-        filename = filename.replace('\\', '/')
-        data = "Index: %s\n" % filename
-        data += ("============================================================="
-                 "======\n")
-        # Note: Should we use /dev/null instead?
-        data += "--- %s\n" % filename
-        data += "+++ %s\n" % filename
-        data += "@@ -0,0 +1,%d @@\n" % nb_lines
-        data += ''.join(file_content)
-      diff.append(data)
+    # Directories will return None so filter them out.
+    diff = filter(None, [scm.SVN.DiffItem(f) for f in files])
     os.chdir(previous_cwd)
     return "".join(diff)
 
   def GetFileNames(self):
     """Return the list of files in the diff."""
     return self.change_info.GetFileNames()
 
   def GetLocalRoot(self):
     """Return the path of the repository root."""
     return self.change_info.GetLocalRoot()
@@ skipping 193 matching lines @@
   NOTE: Very similar to upload.GuessVCS. Doesn't look for hg since we don't
   support it yet.
 
   This examines the current directory, guesses which SCM we're using, and
   returns an instance of the appropriate class.  Exit with an error if we can't
   figure it out.
 
   Returns:
     A SCM instance. Exits if the SCM can't be guessed.
   """
+  __pychecker__ = 'no-returnvalues'
   # Subversion has a .svn in all working directories.
   if os.path.isdir('.svn'):
     logging.info("Guessed VCS = Subversion")
     return SVN(options)
 
   # Git has a command to test if you're in a git tree.
   # Try running it, but don't die if we don't have git installed.
   try:
     out, returncode = gcl.RunShellWithReturnCode(["git", "rev-parse",
                                                   "--is-inside-work-tree"])
@@ skipping 185 matching lines @@
   except (InvalidScript, NoTryServerAccess), e:
     if swallow_exception:
       return 1
     print e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(TryChange(None, None, False))