Add isolate.py trace --merge to do a trace and merge in a single command.

tools/isolate/isolate.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Front end tool to manage .isolate files and corresponding tests.
 
 Run ./isolate.py --help for more detailed information.
 
 See more information at
@@ skipping 647 matching lines @@
         complete_state.root_dir,
         complete_state.saved_state.variables,
         complete_state.result.relative_cwd)
     return value
   except trace_inputs.TracingFailure, e:
     raise ExecutionError(
         'Reading traces failed for: %s\n%s' %
           (' '.join(complete_state.result.command), str(e)))
 
 
+def merge(complete_state):
+  """Reads a trace and merges it back into the source .isolate file."""
+  value = read(complete_state)

[csharp, 2012/09/06 12:59:37]

Nit: what exactly does value contain? Is it a dict, a string?

[M-A Ruel, 2012/09/06 19:26:50]

A dict, as the read() docstring says.

+
+  # Now take that data and union it into the original .isolate file.
+  with open(complete_state.saved_state.isolate_file, 'r') as f:
+    prev_content = f.read()
+  prev_config = merge_isolate.load_gyp(
+      merge_isolate.eval_content(prev_content),
+      merge_isolate.extract_comment(prev_content),
+      merge_isolate.DEFAULT_OSES)
+  new_config = merge_isolate.load_gyp(
+      value,
+      '',
+      merge_isolate.DEFAULT_OSES)
+  config = merge_isolate.union(prev_config, new_config)
+  # pylint: disable=E1103
+  data = merge_isolate.convert_map_to_gyp(
+      *merge_isolate.reduce_inputs(*merge_isolate.invert_map(config.flatten())))
+  print 'Updating %s' % complete_state.saved_state.isolate_file
+  with open(complete_state.saved_state.isolate_file, 'wb') as f:
+    merge_isolate.print_all(config.file_comment, data, f)
+
+
 def CMDcheck(args):
   """Checks that all the inputs are present and update .result."""
   parser = OptionParserIsolate(command='check')
   options, _ = parser.parse_args(args)
   complete_state = load_complete_state(options, NO_INFO)
 
   # Nothing is done specifically. Just store the result and state.
   complete_state.save_files()
   return 0
 
@@ skipping 63 matching lines @@
 
 
 def CMDmerge(args):
   """Reads and merges the data from the trace back into the original .isolate.
 
   Ignores --outdir.
   """
   parser = OptionParserIsolate(command='merge', require_result=False)
   options, _ = parser.parse_args(args)
   complete_state = load_complete_state(options, NO_INFO)
-  value = read(complete_state)
-
-  # Now take that data and union it into the original .isolate file.
-  with open(complete_state.saved_state.isolate_file, 'r') as f:
-    prev_content = f.read()
-  prev_config = merge_isolate.load_gyp(
-      merge_isolate.eval_content(prev_content),
-      merge_isolate.extract_comment(prev_content),
-      merge_isolate.DEFAULT_OSES)
-  new_config = merge_isolate.load_gyp(
-      value,
-      '',
-      merge_isolate.DEFAULT_OSES)
-  config = merge_isolate.union(prev_config, new_config)
-  # pylint: disable=E1103
-  data = merge_isolate.convert_map_to_gyp(
-      *merge_isolate.reduce_inputs(*merge_isolate.invert_map(config.flatten())))
-  print 'Updating %s' % complete_state.saved_state.isolate_file
-  with open(complete_state.saved_state.isolate_file, 'wb') as f:
-    merge_isolate.print_all(config.file_comment, data, f)
-
+  merge(complete_state)
   return 0
 
 
 def CMDread(args):
   """Reads the trace file generated with command 'trace'.
 
   Ignores --outdir.
   """
   parser = OptionParserIsolate(command='read', require_result=False)
   options, _ = parser.parse_args(args)
@@ skipping 94 matching lines @@
   It runs the executable without remapping it, and traces all the files it and
   its child processes access. Then the 'read' command can be used to generate an
   updated .isolate file out of it.
 
   Argument processing stops at the first non-recognized argument and these
   arguments are appended to the command line of the target to run. For example,
   use: isolate.py -r foo.results -- --gtest_filter=Foo.Bar
   """
   parser = OptionParserIsolate(command='trace')
   parser.enable_interspersed_args()
+  parser.add_option(
+      '-m', '--merge', action='store_true',
+      help='After tracing, merge the results back in the .isolate file')
   options, args = parser.parse_args(args)
   complete_state = load_complete_state(options, STATS_ONLY)
   cmd = complete_state.result.command + args
   if not cmd:
     raise ExecutionError('No command to run')
   cmd = trace_inputs.fix_python_path(cmd)
   cwd = os.path.normpath(os.path.join(
       complete_state.root_dir, complete_state.result.relative_cwd))
   logging.info('Running %s, cwd=%s' % (cmd, cwd))
   api = trace_inputs.get_api()
   logfile = complete_state.result_file + '.log'
   api.clean_trace(logfile)
   try:
     with api.get_tracer(logfile) as tracer:
       result, _ = tracer.trace(
           cmd,
           cwd,
           'default',
           True)
   except trace_inputs.TracingFailure, e:
     raise ExecutionError('Tracing failed for: %s\n%s' % (' '.join(cmd), str(e)))
 
   complete_state.save_files()
+
+  if options.merge:
+    merge(complete_state)
+
   return result
 
 
 class OptionParserWithNiceDescription(optparse.OptionParser):
   """Generates the description with the command's docstring."""
   def __init__(self, *args, **kwargs):
     """Sets 'description' and 'usage' if not already specified."""
     command = kwargs.pop('command', None)
     if not 'description' in kwargs:
       kwargs['description'] = re.sub(
@@ skipping 147 matching lines @@
     return command(argv[1:])
   except (ExecutionError, run_test_from_archive.MappingError), e:
     sys.stderr.write('\nError: ')
     sys.stderr.write(str(e))
     sys.stderr.write('\n')
     return 1
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))