Move GenerateDiff into a common function.

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
@@ skipping 662 matching lines @@
   if not editor:
     if sys.platform.startswith("win"):
       editor = "notepad"
     else:
       editor = "vi"
 
   return editor
 
 
 def GenerateDiff(files, root=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.
-  """
-  previous_cwd = os.getcwd()
-  if root is None:
-    os.chdir(GetRepositoryRoot())
-  else:
-    os.chdir(root)
-
-  # 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()
-  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':
-      continue
-    output = RunShell(["svn", "diff", "--config-dir", bogus_dir, filename])
-    if output:
-      diff.append(output)
-    elif SVN.IsMoved(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
-  shutil.rmtree(bogus_dir)
-  os.chdir(previous_cwd)
-  return "".join(diff)
-
+  return SVN.GenerateDiff(files, root=root)
 
 
 def OptionallyDoPresubmitChecks(change_info, committing, args):
   if FilterFlag(args, "--no_presubmit") or FilterFlag(args, "--force"):
     return True
   return DoPresubmitChecks(change_info, committing, True)
 
 
 def UploadCL(change_info, args):
   if not change_info.GetFiles():
@@ skipping 547 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())