rebaseline.py: improve readability of dry-run output

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.
 '''
 
 '''
@@ skipping 141 matching lines @@
     # - if false: we will log an error message but return an empty list so we
     #   go on to the next platform
     #
     # params:
     #  json_url: URL pointing to a JSON actual result summary file
     #
     # TODO(epoger): add a parameter indicating whether "no-comparison"
     # results (those for which we don't have any expectations yet)
     # should be rebaselined.  For now, we only return failed expectations.
     def _GetFilesToRebaseline(self, json_url):
+        if self._dry_run:
+            print ''
+            print '#'
         print ('# Getting files to rebaseline from JSON summary URL %s ...'
                % json_url)
         try:
             json_contents = self._GetContentsOfUrl(json_url)
         except urllib2.HTTPError:
             message = 'unable to load JSON summary URL %s' % json_url
             if self._missing_json_is_fatal:
                 raise ValueError(message)
             else:
                 print '# %s' % message
                 return []
 
         json_dict = gm_json.LoadFromString(json_contents)
         actual_results = json_dict[gm_json.JSONKEY_ACTUALRESULTS]
 
         files_to_rebaseline = []
         failed_results = actual_results[gm_json.JSONKEY_ACTUALRESULTS_FAILED]
         if failed_results:
             files_to_rebaseline.extend(failed_results.keys())
 
         print '# ... found files_to_rebaseline %s' % files_to_rebaseline
+        if self._dry_run:
+            print '#'
         return files_to_rebaseline
 
     # Rebaseline a single file.
     def _RebaselineOneFile(self, expectations_subdir, builder_name,
                            infilename, outfilename):
+        if self._dry_run:
+            print ''
         print '# ' + infilename
         url = ('http://skia-autogen.googlecode.com/svn/gm-actual/' +
                expectations_subdir + '/' + builder_name + '/' +
                expectations_subdir + '/' + infilename)
 
         # Try to download this file, but if that fails, keep going...
         #
         # This not treated as a fatal failure because not all
         # platforms generate all configs (e.g., Android does not
         # generate PDF).
@@ skipping 29 matching lines @@
     #  test: a single test to rebaseline
     def _RebaselineOneTest(self, expectations_subdir, builder_name, test):
         if self._configs:
             configs = self._configs
         else:
             if (expectations_subdir == 'base-shuttle-win7-intel-angle'):
                 configs = [ 'angle', 'anglemsaa16' ]
             else:
                 configs = [ '565', '8888', 'gpu', 'pdf', 'mesa', 'msaa16',
                             'msaa4' ]
+        if self._dry_run:
+            print ''
         print '# ' + expectations_subdir + ':'
         for config in configs:
             infilename = test + '_' + config + '.png'
             outfilename = os.path.join(expectations_subdir, infilename);
             self._RebaselineOneFile(expectations_subdir=expectations_subdir,
                                     builder_name=builder_name,
                                     infilename=infilename,
                                     outfilename=outfilename)
 
     # Rebaseline all platforms/tests/types we specified in the constructor.
@@ skipping 49 matching lines @@
                     help='which tests to rebaseline, e.g. ' +
                     '"--tests aaclip bigmatrix"; if unspecified, then all ' +
                     'failing tests (according to the actual-results.json ' +
                     'file) will be rebaselined.')
 args = parser.parse_args()
 rebaseliner = Rebaseliner(tests=args.tests, configs=args.configs,
                           subdirs=args.subdirs, dry_run=args.dry_run,
                           json_base_url=args.json_base_url,
                           json_filename=args.json_filename)
 rebaseliner.RebaselineAll()