Fix case sensitivity issues and svn move patches for --sub_rep on Windows....

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
 import subprocess
 import sys
 import tempfile
 import xml.dom.minidom
 
 import gclient_utils
 
 def ValidateEmail(email):
  return (re.match(r"^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", email)
          is not None)
 
 
+def GetCasedPath(path):
+  """Elcheapos way to get the real path case on Windows."""
+  if sys.platform.startswith('win') and os.path.exists(path):
+    # Reconstruct the path.
+    path = os.path.abspath(path)
+    paths = path.split('\\')

[bradn, 2010/01/08 23:09:23]

\\ -> os.pathsep
eh, whatever

+    for i in range(len(paths)):
+      if i == 0:
+        # Skip drive letter.
+        continue
+      subpath = '\\'.join(paths[:i+1])
+      prev = len('\\'.join(paths[:i]))
+      # glob.glob will return the cased path for the last item only. This is why
+      # we are calling it in a loop. Extract the data we want and put it back
+      # into the list.
+      paths[i] = glob.glob(subpath + '*')[0][prev+1:len(subpath)]

[bradn, 2010/01/08 23:09:23]

Can you drop the '*' come to think of it, glob should still find it? Or does it
then not recase it?
I guess its ok since if anything else matches, it comes latest in sort order.

[bradn, 2010/01/08 23:09:23]

actually what happens if its the shortname? oh yuck sigh...
actually how about this:
paths[i] = glob.glob(subpath +'*')[0].split('\\')[-1]

+    path = '\\'.join(paths)
+  return path
+
+
 class GIT(object):
   COMMAND = "git"
 
   @staticmethod
   def Capture(args, in_directory=None, print_error=True, error_ok=False):
     """Runs git, capturing output sent to stdout as a string.
 
     Args:
       args: A sequence of command line parameters to be passed to git.
       in_directory: The directory where git is to be run.
@@ skipping 548 matching lines @@
       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, 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), '')
+    root = root or SVN.GetCheckoutRoot(previous_cwd)
+    root = os.path.normcase(os.path.join(root, ''))
     def RelativePath(path, root):
       """We must use relative paths."""
-      if path.startswith(root):
+      if os.path.normcase(path).startswith(root):
         return path[len(root):]
       return path
     try:
       os.chdir(root)
       diff = "".join(filter(None,
                             [SVN.DiffItem(RelativePath(f, root),
                                           full_move=full_move,
                                           revision=revision)
                              for f in filenames]))
     finally:
@@ skipping 67 matching lines @@
     cur_dir_repo_root = infos.get("Repository Root")
     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
+    return GetCasedPath(directory)