rebaseline.py: set text mimetype for all .json files, so text diffs work

tools/rebaseline.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.
 '''
 
 '''
 Rebaselines the given GM tests, on all bots and all configurations.
 
 TODO(epoger): Fix indentation in this file (2-space indents, not 4-space).
 '''
 
 # System-level imports
 import argparse
 import os
 import re
+import subprocess
 import sys
 import urllib2
 
 # Imports from local directory
 import rebaseline_imagefiles
 
 # Imports from within Skia
 #
 # We need to add the 'gm' directory, so that we can import gm_json.py within
 # that directory.  That script allows us to parse the actual-results.json file
@@ skipping 110 matching lines @@
                  tests=None, configs=None, add_new=False):
         self._expectations_root = expectations_root
         self._expectations_filename = expectations_filename
         self._tests = tests
         self._configs = configs
         self._actuals_base_url = actuals_base_url
         self._actuals_filename = actuals_filename
         self._exception_handler = exception_handler
         self._add_new = add_new
         self._image_filename_re = re.compile(gm_json.IMAGE_FILENAME_PATTERN)
+        self._using_svn = os.path.isdir(os.path.join(expectations_root, '.svn'))
+
+    # Executes subprocess.call(cmd).
+    # Raises an Exception if the command fails.
+    def _Call(self, cmd):
+        if subprocess.call(cmd) != 0:
+            raise _InternalException('error running command: ' + ' '.join(cmd))
 
     # Returns the full contents of filepath, as a single string.
     # If filepath looks like a URL, try to read it that way instead of as
     # a path on local storage.
     #
     # Raises _InternalException if there is a problem.
     def _GetFileContents(self, filepath):
         if filepath.startswith('http:') or filepath.startswith('https:'):
             try:
                 return urllib2.urlopen(filepath).read()
@@ skipping 87 matching lines @@
                         continue
                 if not expected_results.get(image_name):
                     expected_results[image_name] = {}
                 expected_results[image_name] \
                     [gm_json.JSONKEY_EXPECTEDRESULTS_ALLOWEDDIGESTS] = \
                         [image_results]
 
         # Write out updated expectations.
         gm_json.WriteToFile(expectations_dict, expectations_json_filepath)
 
+        # Mark the JSON file as plaintext, so text-style diffs can be applied.
+        # Fixes https://code.google.com/p/skia/issues/detail?id=1442
+        if self._using_svn:
+            self._Call(['svn', 'propset', '--quiet', 'svn:mime-type',
+                        'text/x-json', expectations_json_filepath])
 
 # main...
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--actuals-base-url',
                     help='base URL from which to read files containing JSON ' +
                     'summaries of actual GM results; defaults to %(default)s',
                     default='http://skia-autogen.googlecode.com/svn/gm-actual')
 parser.add_argument('--actuals-filename',
                     help='filename (within platform-specific subdirectories ' +
@@ skipping 92 matching lines @@
             exception_handler=exception_handler,
             add_new=args.add_new,
             missing_json_is_fatal=missing_json_is_fatal)
 
     try:
         rebaseliner.RebaselineSubdir(subdir=subdir, builder=builder)
     except BaseException as e:
         exception_handler.RaiseExceptionOrContinue(e)
 
 exception_handler.ReportAllFailures()