Fix svn mv/cp/ren diff for real this time, for try jobs.

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 glob
 import os
 import re
 import shutil
@@ skipping 593 matching lines @@
     # 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.
       command = ["diff", "--config-dir", bogus_dir, filename]
       if revision:
         command.extend(['--revision', revision])
-      data = SVN.Capture(command, None)
-      if data:
-        pass
-      elif SVN.IsMoved(filename):
+      if 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.
           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
+          # svn diff on a mv/cp'd file outputs nothing if there was no change.
+          data = SVN.Capture(command, None)
+          if not data:
+            # 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
+        data = SVN.Capture(command, None)
     finally:
       shutil.rmtree(bogus_dir)
     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
@@ skipping 87 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 GetCasedPath(directory)