Add "diff against" support when sending try patches.

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 os
 import re
 import shutil
 import subprocess
@@ skipping 532 matching lines @@
       empty string is also returned.
     """
     output = SVN.Capture(["propget", property_name, file])
     if (output.startswith("svn: ") and
         output.endswith("is not under version control")):
       return ""
     else:
       return output
 
   @staticmethod
-  def DiffItem(filename, full_move=False):
+  def DiffItem(filename, full_move=False, revision=None):
     """Diffs a single file.
 
     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."""
     # 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":
       return None
     # 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.
     bogus_dir = tempfile.mkdtemp()
     try:
       # Grabs the diff data.
-      data = SVN.Capture(["diff", "--config-dir", bogus_dir, filename], None)
+      command = ["diff", "--config-dir", bogus_dir, filename]
+      if revision is not None:

[bradn, 2010/01/07 01:50:13]

if not revision:

+        command.extend(['--revision', revision])
+      data = SVN.Capture(command, None)
       if data:
         pass
       elif SVN.IsMoved(filename):
         if full_move:
           file_content = gclient_utils.FileRead(filename, 'rb')
           # 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 += '=' * 67 + '\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)
         else:
           #  svn diff on a mv/cp'd file outputs nothing.
           # We put in an empty Index entry so upload.py knows about them.
           data = "Index: %s\n" % filename
       else:
         # The file is not modified anymore. It should be removed from the set.
         pass
     finally:
       shutil.rmtree(bogus_dir)
     return data
 
   @staticmethod
-  def GenerateDiff(filenames, root=None, full_move=False):
+  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.
     The diff will always use relative paths.
     """
     previous_cwd = os.getcwd()
     root = os.path.join(root or SVN.GetCheckoutRoot(previous_cwd), '')
     def RelativePath(path, root):
       """We must use relative paths."""
       if path.startswith(root):
         return path[len(root):]
       return path
     try:
       os.chdir(root)
       diff = "".join(filter(None,
-                            [SVN.DiffItem(RelativePath(f, root),
+                            [SVN.DiffItem(RelativePath(f, root, revision),
                                           full_move=full_move)
                              for f in filenames]))
     finally:
       os.chdir(previous_cwd)
     return diff
 
 
   @staticmethod
   def GetEmail(repo_root):
     """Retrieves the svn account which we assume is an email address."""
@@ skipping 61 matching lines @@
     if not cur_dir_repo_root:
       return None
 
     while True:
       parent = os.path.dirname(directory)
       if (SVN.CaptureInfo(parent, print_error=False).get(
               "Repository Root") != cur_dir_repo_root):
         break
       directory = parent
     return directory