Make svndiff.py work on Windows and with svn 1.7.

tools/svndiff.py

 #!/usr/bin/python
 '''
 Copyright 2012 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 '''
 
 '''
 Generates a visual diff of all pending changes in the local SVN (or git!)
@@ skipping 205 matching lines @@
     @param dest_dir existing directory within which to write results
     @param source_dir
     """
     # Validate parameters, filling in default values if necessary and possible.
     path_to_skdiff = os.path.abspath(FindPathToSkDiff(path_to_skdiff))
     if not dest_dir:
         dest_dir = tempfile.mkdtemp()
     dest_dir = os.path.abspath(dest_dir)
 
     os.chdir(source_dir)
-    using_svn = os.path.isdir('.svn')
+    svn_repo = svn.Svn('.')
+    using_svn = True
+    try:
+      svn_repo.GetInfo()
+    except:
+      using_svn = False
 
     # Prepare temporary directories.
     modified_flattened_dir = os.path.join(dest_dir, 'modified_flattened')
     original_flattened_dir = os.path.join(dest_dir, 'original_flattened')
     diff_dir = os.path.join(dest_dir, 'diffs')
     for dir in [modified_flattened_dir, original_flattened_dir, diff_dir] :
         shutil.rmtree(dir, ignore_errors=True)
         os.mkdir(dir)
 
     # Get a list of all locally modified (including added/deleted) files,
     # descending subdirectories.
     if using_svn:
-        svn_repo = svn.Svn('.')
         modified_file_paths = svn_repo.GetFilesWithStatus(
             svn.STATUS_ADDED | svn.STATUS_DELETED | svn.STATUS_MODIFIED)
     else:
         modified_file_paths = _GitGetModifiedFiles()
 
     # For each modified file:
     # 1. copy its current contents into modified_flattened_dir
     # 2. copy its original contents into original_flattened_dir
     for modified_file_path in modified_file_paths:
         if modified_file_path.endswith('.json'):
             # Special handling for JSON files, in the hopes that they
             # contain GM result summaries.
-            (_unused, original_file_path) = tempfile.mkstemp()
+            original_file = tempfile.NamedTemporaryFile(delete = False)
+            original_file.close()
             if using_svn:
                 svn_repo.ExportBaseVersionOfFile(
-                    modified_file_path, original_file_path)
+                    modified_file_path, original_file.name)
             else:
                 _GitExportBaseVersionOfFile(
-                    modified_file_path, original_file_path)
-            platform_prefix = re.sub(os.sep, '__',
-                                     os.path.dirname(modified_file_path)) + '__'
-            _CallJsonDiff(old_json_path=original_file_path,
+                    modified_file_path, original_file.name)
+            original_directory = os.path.dirname(original_file.name)
+            platform_prefix = (re.sub(re.escape(os.sep), '__',
+                                      os.path.splitdrive(original_directory)[1])
+                              + '__')
+            _CallJsonDiff(old_json_path=original_file.name,
                           new_json_path=modified_file_path,
                           old_flattened_dir=original_flattened_dir,
                           new_flattened_dir=modified_flattened_dir,
                           filename_prefix=platform_prefix)
-            os.remove(original_file_path)
+            os.remove(original_file.name)
         else:
-            dest_filename = re.sub(os.sep, '__', modified_file_path)
+            dest_filename = re.sub(re.escape(os.sep), '__', modified_file_path)
             # If the file had STATUS_DELETED, it won't exist anymore...
             if os.path.isfile(modified_file_path):
                 shutil.copyfile(modified_file_path,
                                 os.path.join(modified_flattened_dir,
                                              dest_filename))
             if using_svn:
                 svn_repo.ExportBaseVersionOfFile(
                     modified_file_path,
                     os.path.join(original_flattened_dir, dest_filename))
             else:
                 _GitExportBaseVersionOfFile(
                     modified_file_path,
                     os.path.join(original_flattened_dir, dest_filename))
 
     # Run skdiff: compare original_flattened_dir against modified_flattened_dir
     RunCommand('%s %s %s %s' % (path_to_skdiff, original_flattened_dir,
                                 modified_flattened_dir, diff_dir))
+
     print '\nskdiff results are ready in file://%s/index.html' % diff_dir
 
 def RaiseUsageException():
     raise Exception('%s\nRun with --help for more detail.' % (
         USAGE_STRING % __file__))
 
 def Main(options, args):
     """Allow other scripts to call this script with fake command-line args.
     """
     num_args = len(args)
@@ skipping 14 matching lines @@
                       help='path to already-built skdiff tool; if not set, '
                       'will search for it in typical directories near this '
                       'script')
     parser.add_option(OPTION_SOURCE_DIR,
                       action='store', type='string',
                       default=os.path.join('expectations', 'gm'),
                       help='root directory within which to compare all ' +
                       'files; defaults to "%default"')
     (options, args) = parser.parse_args()
     Main(options, args)