svndiff for the windows

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!)
 checkout.
 
 Launch with --help to see more information.
 
 TODO(epoger): Now that this tool supports either git or svn, rename it.
 TODO(epoger): Fix indentation in this file (2-space indents, not 4-space).
 '''
 
 # common Python modules
 import optparse
 import os
+import posixpath
 import re
 import shutil
 import subprocess
 import sys
 import tempfile
 import urllib2
 
 # Imports from within Skia
 #
 # We need to add the 'gm' directory, so that we can import gm_json.py within
@@ skipping 48 matching lines @@
 
     @param user_set_path if None, the user did not specify a path, so look in
            some likely places; otherwise, only check at this path
     """
     if user_set_path is not None:
         if os.path.isfile(user_set_path):
             return user_set_path
         raise Exception('unable to find skdiff at user-set path %s' %
                         user_set_path)
     trunk_path = os.path.join(os.path.dirname(__file__), os.pardir)
-    possible_paths = [os.path.join(trunk_path, 'out', 'Release', 'skdiff'),
-                      os.path.join(trunk_path, 'out', 'Debug', 'skdiff')]
+
+    extension = ''
+    if os.name is 'nt':
+        extension = '.exe'
+        
+    possible_paths = [os.path.join(trunk_path, 'out', 'Release',
+                                    'skdiff' + extension),
+                      os.path.join(trunk_path, 'out', 'Debug',
+                                   'skdiff' + extension)]
     for try_path in possible_paths:
         if os.path.isfile(try_path):
             return try_path
     raise Exception('cannot find skdiff in paths %s; maybe you need to '
                     'specify the %s option or build skdiff?' % (
                         possible_paths, OPTION_PATH_TO_SKDIFF))
 
 def _DownloadUrlToFile(source_url, dest_path):
     """Download source_url, and save its contents to dest_path.
     Raises an exception if there were any problems."""
@@ skipping 93 matching lines @@
     """
     # TODO(epoger): Replace use of "git show" command with lower-level git
     # commands?  senorblanco points out that "git show" is a "porcelain"
     # command, intended for human use, as opposed to the "plumbing" commands
     # generally more suitable for scripting.  (See
     # http://git-scm.com/book/en/Git-Internals-Plumbing-and-Porcelain )
     #
     # For now, though, "git show" is the most straightforward implementation
     # I could come up with.  I tried using "git cat-file", but I had trouble
     # getting it to work as desired.
-    args = ['git', 'show', os.path.join('HEAD:.', file_within_repo)]
+    # Note that git expects / rather than \ as a path separator even on
+    # windows.
+    args = ['git', 'show', posixpath.join('HEAD:.', file_within_repo)]
     with open(dest_path, 'wb') as outfile:
         proc = subprocess.Popen(args, stdout=outfile)
         proc.communicate()
         if proc.returncode is not 0:
             raise Exception('command "%s" failed' % args)
 
 def SvnDiff(path_to_skdiff, dest_dir, source_dir):
     """Generates a visual diff of all pending changes in source_dir.
 
     @param path_to_skdiff
@@ skipping 101 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)