libv8 5.7.492.65.1 → 5.9.211.38.0beta0

data/vendor/depot_tools/recipes/recipe_modules/bot_update/{example.py → examples/full.py}

@@ -5,6 +5,7 @@
 DEPS = [
   'bot_update',
   'gclient',
+  'gerrit',
   'recipe_engine/path',
   'recipe_engine/platform',
   'recipe_engine/properties',
@@ -20,15 +21,23 @@ def RunSteps(api):
   soln.revision = api.properties.get('revision')
   api.gclient.c = src_cfg
   api.gclient.c.revisions.update(api.properties.get('revisions', {}))
-  api.gclient.c.got_revision_mapping['src'] = 'got_cr_revision'
+  if api.properties.get('deprecated_got_revision_mapping'):
+    api.gclient.c.got_revision_mapping['src'] = 'got_cr_revision'
+  else:
+    api.gclient.c.got_revision_reverse_mapping['got_cr_revision'] = 'src'
+    api.gclient.c.got_revision_reverse_mapping['got_revision'] = 'src'
+    api.gclient.c.got_revision_reverse_mapping['got_v8_revision'] = 'src/v8'
+    api.gclient.c.got_revision_reverse_mapping['got_angle_revision'] = (
+        'src/third_party/angle')
   api.gclient.c.patch_projects['v8'] = ('src/v8', 'HEAD')
+  api.gclient.c.patch_projects['v8/v8'] = ('src/v8', 'HEAD')
   api.gclient.c.patch_projects['angle/angle'] = ('src/third_party/angle',
                                                  'HEAD')
   patch = api.properties.get('patch', True)
   clobber = True if api.properties.get('clobber') else False
   no_shallow = True if api.properties.get('no_shallow') else False
-  output_manifest = api.properties.get('output_manifest', False)
   with_branch_heads = api.properties.get('with_branch_heads', False)
+  with_tags = api.properties.get('with_tags', False)
   refs = api.properties.get('refs', [])
   oauth2 = api.properties.get('oauth2', False)
   oauth2_json = api.properties.get('oauth2_json', False)
@@ -44,18 +53,21 @@ def RunSteps(api):
         gerrit_no_reset=gerrit_no_reset,
         gerrit_no_rebase_patch_ref=gerrit_no_rebase_patch_ref)
   else:
-    api.bot_update.ensure_checkout(
+    bot_update_step = api.bot_update.ensure_checkout(
         no_shallow=no_shallow,
         patch=patch,
         with_branch_heads=with_branch_heads,
-        output_manifest=output_manifest,
+        with_tags=with_tags,
         refs=refs, patch_oauth2=oauth2,
         oauth2_json=oauth2_json,
         clobber=clobber,
         root_solution_revision=root_solution_revision,
         suffix=suffix,
         gerrit_no_reset=gerrit_no_reset,
-        gerrit_no_rebase_patch_ref=gerrit_no_rebase_patch_ref)
+        gerrit_no_rebase_patch_ref=gerrit_no_rebase_patch_ref,
+        disable_syntax_validation=True)
+    if patch:
+      api.bot_update.deapply_patch(bot_update_step)
 
 
 def GenTests(api):
@@ -72,14 +84,18 @@ def GenTests(api):
       with_branch_heads=True,
       suffix='with branch heads'
   )
-  yield api.test('basic_output_manifest') + api.properties(
-      output_manifest=True,
-  )
+  yield api.test('with_tags') + api.properties(with_tags=True)
   yield api.test('tryjob') + api.properties(
       issue=12345,
       patchset=654321,
       rietveld='https://rietveld.example.com/',
   )
+  yield api.test('deprecated_got_revision_mapping') + api.properties(
+      deprecated_got_revision_mapping=True,
+      issue=12345,
+      patchset=654321,
+      rietveld='https://rietveld.example.com/',
+  )
   yield api.test('trychange') + api.properties(
       refs=['+refs/change/1/2/333'],
   )
@@ -155,6 +171,28 @@ def GenTests(api):
       patch_issue=338811,
       patch_set=3,
   )
+  yield api.test('tryjob_gerrit_v8') + api.properties.tryserver(
+      gerrit_project='v8/v8',
+      patch_issue=338811,
+      patch_set=3,
+  )
+  yield api.test('tryjob_gerrit_v8_feature_branch') + api.properties.tryserver(
+      gerrit_project='v8/v8',
+      patch_issue=338811,
+      patch_set=3,
+  ) + api.step_data(
+      'gerrit get_patch_destination_branch',
+      api.gerrit.get_one_change_response_data(branch='experimental/feature'),
+  )
+  yield api.test('tryjob_gerrit_feature_branch') + api.properties.tryserver(
+      buildername='feature_rel',
+      gerrit_project='chromium/src',
+      patch_issue=338811,
+      patch_set=3,
+  ) + api.step_data(
+      'gerrit get_patch_destination_branch',
+      api.gerrit.get_one_change_response_data(branch='experimental/feature'),
+  )
   yield api.test('tryjob_gerrit_angle_deprecated') + api.properties.tryserver(
       patch_project='angle/angle',
       gerrit='https://chromium-review.googlesource.com',

data/vendor/depot_tools/recipes/recipe_modules/bot_update/resources/bot_update.py

@@ -31,10 +31,6 @@ BUF_SIZE = 256
 
 
 # Define a bunch of directory paths.
-# Relative to the current working directory.
-CURRENT_DIR = path.abspath(os.getcwd())
-BUILDER_DIR = path.dirname(CURRENT_DIR)
-
 # Relative to this script's filesystem path.
 THIS_DIR = path.dirname(path.abspath(__file__))
 
@@ -44,9 +40,10 @@ CHROMIUM_GIT_HOST = 'https://chromium.googlesource.com'
 CHROMIUM_SRC_URL = CHROMIUM_GIT_HOST + '/chromium/src.git'
 
 BRANCH_HEADS_REFSPEC = '+refs/branch-heads/*'
+TAGS_REFSPEC = '+refs/tags/*'
 
 # Regular expression that matches a single commit footer line.
-COMMIT_FOOTER_ENTRY_RE = re.compile(r'([^:]+):\s+(.+)')
+COMMIT_FOOTER_ENTRY_RE = re.compile(r'([^:]+):\s*(.*)')
 
 # Footer metadata keys for regular and gsubtreed mirrored commit positions.
 COMMIT_POSITION_FOOTER_KEY = 'Cr-Commit-Position'
@@ -59,13 +56,13 @@ REVINFO_RE = re.compile(r'^([^:]+):\s+([^@]+)@(.+)$')
 # Copied from scripts/recipes/chromium.py.
 GOT_REVISION_MAPPINGS = {
     CHROMIUM_SRC_URL: {
-        'src/': 'got_revision',
-        'src/native_client/': 'got_nacl_revision',
-        'src/tools/swarm_client/': 'got_swarm_client_revision',
-        'src/tools/swarming_client/': 'got_swarming_client_revision',
-        'src/third_party/WebKit/': 'got_webkit_revision',
-        'src/third_party/webrtc/': 'got_webrtc_revision',
-        'src/v8/': 'got_v8_revision',
+        'got_revision': 'src/',
+        'got_nacl_revision': 'src/native_client/',
+        'got_swarm_client_revision': 'src/tools/swarm_client/',
+        'got_swarming_client_revision': 'src/tools/swarming_client/',
+        'got_v8_revision': 'src/v8/',
+        'got_webkit_revision': 'src/third_party/WebKit/',
+        'got_webrtc_revision': 'src/third_party/webrtc/',
     }
 }
 
@@ -142,9 +139,7 @@ def call(*args, **kwargs):  # pragma: no cover
   kwargs['stderr'] = subprocess.STDOUT
   kwargs.setdefault('bufsize', BUF_SIZE)
   cwd = kwargs.get('cwd', os.getcwd())
-  result_fn = kwargs.pop('result_fn', lambda code, out: RETRY if code else OK)
   stdin_data = kwargs.pop('stdin_data', None)
-  tries = kwargs.pop('tries', ATTEMPTS)
   if stdin_data:
     kwargs['stdin'] = subprocess.PIPE
   out = cStringIO.StringIO()
@@ -152,64 +147,53 @@ def call(*args, **kwargs):  # pragma: no cover
   env = copy.copy(os.environ)
   env.update(new_env)
   kwargs['env'] = env
-  attempt = 0
-  for attempt in range(1, tries + 1):
-    attempt_msg = ' (attempt #%d)' % attempt if attempt else ''
-    if new_env:
-      print '===Injecting Environment Variables==='
-      for k, v in sorted(new_env.items()):
-        print '%s: %s' % (k, v)
-    print '===Running %s%s===' % (' '.join(args), attempt_msg)
-    print 'In directory: %s' % cwd
-    start_time = time.time()
-    proc = subprocess.Popen(args, **kwargs)
-    if stdin_data:
-      proc.stdin.write(stdin_data)
-      proc.stdin.close()
-    psprinter = PsPrinter()
-    # This is here because passing 'sys.stdout' into stdout for proc will
-    # produce out of order output.
-    hanging_cr = False
-    while True:
-      psprinter.poke()
-      buf = proc.stdout.read(BUF_SIZE)
-      if not buf:
-        break
-      if hanging_cr:
-        buf = '\r' + buf
-      hanging_cr = buf.endswith('\r')
-      if hanging_cr:
-        buf = buf[:-1]
-      buf = buf.replace('\r\n', '\n').replace('\r', '\n')
-      sys.stdout.write(buf)
-      out.write(buf)
-    if hanging_cr:
-      sys.stdout.write('\n')
-      out.write('\n')
-    psprinter.cancel()
-
-    code = proc.wait()
-    elapsed_time = ((time.time() - start_time) / 60.0)
-    outval = out.getvalue()
-    result = result_fn(code, outval)
-    if result in (FAIL, RETRY):
-      print '===Failed in %.1f mins===' % elapsed_time
-      print
-    else:
-      print '===Succeeded in %.1f mins===' % elapsed_time
-      print
-      return outval
-    if result is FAIL:
+
+  if new_env:
+    print '===Injecting Environment Variables==='
+    for k, v in sorted(new_env.items()):
+      print '%s: %s' % (k, v)
+  print '===Running %s===' % (' '.join(args),)
+  print 'In directory: %s' % cwd
+  start_time = time.time()
+  proc = subprocess.Popen(args, **kwargs)
+  if stdin_data:
+    proc.stdin.write(stdin_data)
+    proc.stdin.close()
+  psprinter = PsPrinter()
+  # This is here because passing 'sys.stdout' into stdout for proc will
+  # produce out of order output.
+  hanging_cr = False
+  while True:
+    psprinter.poke()
+    buf = proc.stdout.read(BUF_SIZE)
+    if not buf:
       break
-    if result is RETRY and attempt < tries:
-      sleep_backoff = 4 ** attempt
-      sleep_time = random.randint(sleep_backoff, int(sleep_backoff * 1.2))
-      print '===backing off, sleeping for %d secs===' % sleep_time
-      time.sleep(sleep_time)
+    if hanging_cr:
+      buf = '\r' + buf
+    hanging_cr = buf.endswith('\r')
+    if hanging_cr:
+      buf = buf[:-1]
+    buf = buf.replace('\r\n', '\n').replace('\r', '\n')
+    sys.stdout.write(buf)
+    out.write(buf)
+  if hanging_cr:
+    sys.stdout.write('\n')
+    out.write('\n')
+  psprinter.cancel()
+
+  code = proc.wait()
+  elapsed_time = ((time.time() - start_time) / 60.0)
+  outval = out.getvalue()
+  if code:
+    print '===Failed in %.1f mins===' % elapsed_time
+    print
+    raise SubprocessFailed('%s failed with code %d in %s.' %
+                           (' '.join(args), code, cwd),
+                           code, outval)
 
-  raise SubprocessFailed('%s failed with code %d in %s after %d attempts.' %
-                         (' '.join(args), code, cwd, attempt),
-                         code, outval)
+  print '===Succeeded in %.1f mins===' % elapsed_time
+  print
+  return outval
 
 
 def git(*args, **kwargs):  # pragma: no cover
@@ -293,12 +277,12 @@ def modify_solutions(input_solutions):
   return solutions
 
 
-def remove(target):
-  """Remove a target by moving it into build.dead."""
-  dead_folder = path.join(BUILDER_DIR, 'build.dead')
-  if not path.exists(dead_folder):
-    os.makedirs(dead_folder)
-  dest = path.join(dead_folder, uuid.uuid4().hex)
+def remove(target, cleanup_dir):
+  """Remove a target by moving it into cleanup_dir."""
+  if not path.exists(cleanup_dir):
+    os.makedirs(cleanup_dir)
+  dest = path.join(cleanup_dir, '%s_%s' % (
+      path.basename(target), uuid.uuid4().hex))
   print 'Marking for removal %s => %s' % (target, dest)
   try:
     os.rename(target, dest)
@@ -307,7 +291,7 @@ def remove(target):
     raise
 
 
-def ensure_no_checkout(dir_names):
+def ensure_no_checkout(dir_names, cleanup_dir):
   """Ensure that there is no undesired checkout under build/."""
   build_dir = os.getcwd()
   has_checkout = any(path.exists(path.join(build_dir, dir_name, '.git'))
@@ -316,7 +300,7 @@ def ensure_no_checkout(dir_names):
     for filename in os.listdir(build_dir):
       deletion_target = path.join(build_dir, filename)
       print '.git detected in checkout, deleting %s...' % deletion_target,
-      remove(deletion_target)
+      remove(deletion_target, cleanup_dir)
       print 'done'
 
 
@@ -339,7 +323,9 @@ def gclient_configure(solutions, target_os, target_os_only, git_cache_dir):
         solutions, target_os, target_os_only, git_cache_dir))
 
 
-def gclient_sync(with_branch_heads, shallow, revisions, break_repo_locks):
+def gclient_sync(
+    with_branch_heads, with_tags, shallow, revisions, break_repo_locks,
+    disable_syntax_validation):
   # We just need to allocate a filename.
   fd, gclient_output_file = tempfile.mkstemp(suffix='.json')
   os.close(fd)
@@ -349,17 +335,21 @@ def gclient_sync(with_branch_heads, shallow, revisions, break_repo_locks):
          '--nohooks', '--noprehooks', '--delete_unversioned_trees']
   if with_branch_heads:
     args += ['--with_branch_heads']
+  if with_tags:
+    args += ['--with_tags']
   if shallow:
     args += ['--shallow']
   if break_repo_locks:
     args += ['--break_repo_locks']
+  if disable_syntax_validation:
+    args += ['--disable-syntax-validation']
   for name, revision in sorted(revisions.iteritems()):
     if revision.upper() == 'HEAD':
       revision = 'origin/master'
     args.extend(['--revision', '%s@%s' % (name, revision)])
 
   try:
-    call_gclient(*args, tries=1)
+    call_gclient(*args)
   except SubprocessFailed as e:
     # Throw a GclientSyncFailed exception so we can catch this independently.
     raise GclientSyncFailed(e.message, e.code, e.output)
@@ -407,9 +397,9 @@ def get_commit_message_footer_map(message):
   for line in lines:
     m = COMMIT_FOOTER_ENTRY_RE.match(line)
     if not m:
-      # If any single line isn't valid, the entire footer is invalid.
-      footers.clear()
-      return footers
+      # If any single line isn't valid, continue anyway for compatibility with
+      # Gerrit (which itself uses JGit for this).
+      continue
     footers[m.group(1)] = m.group(2).strip()
   return footers
 
@@ -420,17 +410,6 @@ def get_commit_message_footer(message, key):
   return get_commit_message_footer_map(message).get(key)
 
 
-def emit_log_lines(name, lines):
-  for line in lines.splitlines():
-    print '@@@STEP_LOG_LINE@%s@%s@@@' % (name, line)
-  print '@@@STEP_LOG_END@%s@@@' % name
-
-
-def emit_properties(properties):
-  for property_name, property_value in sorted(properties.items()):
-    print '@@@SET_BUILD_PROPERTY@%s@"%s"@@@' % (property_name, property_value)
-
-
 # Derived from:
 # http://code.activestate.com/recipes/577972-disk-usage/?in=user-4178764
 def get_total_disk_space():
@@ -474,10 +453,16 @@ def force_revision(folder_name, revision):
     branch, revision = split_revision
 
   if revision and revision.upper() != 'HEAD':
-    git('checkout', '--force', revision, cwd=folder_name, tries=1)
+    git('checkout', '--force', revision, cwd=folder_name)
   else:
+    # TODO(machenbach): This won't work with branch-heads, as Gerrit's
+    # destination branch would be e.g. refs/branch-heads/123. But here
+    # we need to pass refs/remotes/branch-heads/123 to check out.
+    # This will also not work if somebody passes a local refspec like
+    # refs/heads/master. It needs to translate to refs/remotes/origin/master
+    # first. See also https://crbug.com/740456 .
     ref = branch if branch.startswith('refs/') else 'origin/%s' % branch
-    git('checkout', '--force', ref, cwd=folder_name, tries=1)
+    git('checkout', '--force', ref, cwd=folder_name)
 
 
 def is_broken_repo_dir(repo_dir):
@@ -504,7 +489,8 @@ def _maybe_break_locks(checkout_path):
           raise
 
 
-def git_checkout(solutions, revisions, shallow, refs, git_cache_dir):
+def git_checkout(solutions, revisions, shallow, refs, git_cache_dir,
+                 cleanup_dir):
   build_dir = os.getcwd()
   # Before we do anything, break all git_cache locks.
   if path.isdir(git_cache_dir):
@@ -546,17 +532,17 @@ def git_checkout(solutions, revisions, shallow, refs, git_cache_dir):
         # state.
         if path.exists(sln_dir) and is_broken_repo_dir(sln_dir):
           print 'Git repo %s appears to be broken, removing it' % sln_dir
-          remove(sln_dir)
+          remove(sln_dir, cleanup_dir)
 
         # Use "tries=1", since we retry manually in this loop.
         if not path.isdir(sln_dir):
-          git(*clone_cmd, tries=1)
+          git(*clone_cmd)
         else:
-          git('remote', 'set-url', 'origin', mirror_dir, cwd=sln_dir, tries=1)
-          git('fetch', 'origin', cwd=sln_dir, tries=1)
+          git('remote', 'set-url', 'origin', mirror_dir, cwd=sln_dir)
+          git('fetch', 'origin', cwd=sln_dir)
         for ref in refs:
           refspec = '%s:%s' % (ref, ref.lstrip('+'))
-          git('fetch', 'origin', refspec, cwd=sln_dir, tries=1)
+          git('fetch', 'origin', refspec, cwd=sln_dir)
 
         # Windows sometimes has trouble deleting files.
         # This can make git commands that rely on locks fail.
@@ -587,7 +573,7 @@ def git_checkout(solutions, revisions, shallow, refs, git_cache_dir):
         sleep_secs = 2**tries
         print 'waiting %s seconds and trying again...' % sleep_secs
         time.sleep(sleep_secs)
-        remove(sln_dir)
+        remove(sln_dir, cleanup_dir)
 
     git('clean', '-dff', cwd=sln_dir)
 
@@ -648,7 +634,7 @@ def apply_rietveld_issue(issue, patchset, root, server, _rev_map, _revision,
 
   # Only try once, since subsequent failures hide the real failure.
   try:
-    call(*cmd, tries=1)
+    call(*cmd)
   except SubprocessFailed as e:
     raise PatchFailed(e.message, e.code, e.output)
 
@@ -668,7 +654,7 @@ def apply_gerrit_ref(gerrit_repo, gerrit_ref, root, gerrit_reset,
   # command will do so. See http://crbug.com/692067.
   git('reset', '--hard', cwd=root)
   try:
-    git('retry', 'fetch', gerrit_repo, gerrit_ref, cwd=root, tries=1)
+    git('fetch', gerrit_repo, gerrit_ref, cwd=root)
     git('checkout', 'FETCH_HEAD', cwd=root)
 
     if gerrit_rebase_patch_ref:
@@ -679,7 +665,9 @@ def apply_gerrit_ref(gerrit_repo, gerrit_ref, root, gerrit_reset,
         ok = False
         git('checkout', '-b', temp_branch_name, cwd=root)
         try:
-          git('rebase', base_rev, cwd=root, tries=1)
+          git('-c', 'user.name=chrome-bot',
+              '-c', 'user.email=chrome-bot@chromium.org',
+              'rebase', base_rev, cwd=root)
         except SubprocessFailed:
           # Abort the rebase since there were failures.
           git('rebase', '--abort', cwd=root)
@@ -728,7 +716,7 @@ def parse_got_revision(gclient_output, got_revision_mapping):
       '%s/' % path.rstrip('/') : solution_output for path, solution_output
       in gclient_output['solutions'].iteritems()
   }
-  for dir_name, property_name in got_revision_mapping.iteritems():
+  for property_name, dir_name in got_revision_mapping.iteritems():
     # Make sure dir_name always ends with a single slash.
     dir_name = '%s/' % dir_name.rstrip('/')
     if dir_name not in solutions_output:
@@ -765,13 +753,14 @@ def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
                     gerrit_ref, gerrit_rebase_patch_ref, revision_mapping,
                     apply_issue_email_file, apply_issue_key_file,
                     apply_issue_oauth2_file, shallow, refs, git_cache_dir,
-                    gerrit_reset):
+                    cleanup_dir, gerrit_reset, disable_syntax_validation):
   # Get a checkout of each solution, without DEPS or hooks.
   # Calling git directly because there is no way to run Gclient without
   # invoking DEPS.
   print 'Fetching Git checkout'
 
-  git_ref = git_checkout(solutions, revisions, shallow, refs, git_cache_dir)
+  git_ref = git_checkout(solutions, revisions, shallow, refs, git_cache_dir,
+                         cleanup_dir)
 
   print '===Processing patch solutions==='
   already_patched = []
@@ -815,8 +804,13 @@ def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
   # Let gclient do the DEPS syncing.
   # The branch-head refspec is a special case because its possible Chrome
   # src, which contains the branch-head refspecs, is DEPSed in.
-  gclient_output = gclient_sync(BRANCH_HEADS_REFSPEC in refs, shallow,
-                                gc_revisions, break_repo_locks)
+  gclient_output = gclient_sync(
+      BRANCH_HEADS_REFSPEC in refs,
+      TAGS_REFSPEC in refs,
+      shallow,
+      gc_revisions,
+      break_repo_locks,
+      disable_syntax_validation)
 
   # Now that gclient_sync has finished, we should revert any .DEPS.git so that
   # presubmit doesn't complain about it being modified.
@@ -868,10 +862,9 @@ def parse_revisions(revisions, root):
       parsed_root = urlparse.urlparse(current_root)
       if parsed_root.scheme in ['http', 'https']:
         # We want to normalize git urls into .git urls.
-        normalized_root = 'https://%s/%s' % (parsed_root.netloc,
-                                             parsed_root.path)
+        normalized_root = 'https://' + parsed_root.netloc + parsed_root.path
         if not normalized_root.endswith('.git'):
-          normalized_root = '%s.git' % normalized_root
+          normalized_root += '.git'
       elif parsed_root.scheme:
         print 'WARNING: Unrecognized scheme %s, ignoring' % parsed_root.scheme
         continue
@@ -914,16 +907,18 @@ def parse_args():
   parse.add_option('--gerrit_no_reset', action='store_true',
                    help='Bypass calling reset after applying a gerrit ref.')
   parse.add_option('--specs', help='Gcilent spec.')
+  parse.add_option('--spec-path', help='Path to a Gcilent spec file.')
   parse.add_option('--revision_mapping_file',
                    help=('Path to a json file of the form '
-                         '{"path/to/repo/": "property_name"}'))
+                         '{"property_name": "path/to/repo/"}'))
   parse.add_option('--revision', action='append', default=[],
                    help='Revision to check out. Can be any form of git ref. '
                         'Can prepend root@<rev> to specify which repository, '
                         'where root is either a filesystem path or git https '
                         'url. To specify Tip of Tree, set rev to HEAD. ')
+  # TODO(machenbach): Remove the flag when all uses have been removed.
   parse.add_option('--output_manifest', action='store_true',
-                   help=('Add manifest json to the json output.'))
+                   help=('Deprecated.'))
   parse.add_option('--clobber', action='store_true',
                    help='Delete checkout first, always')
   parse.add_option('--output_json',
@@ -937,11 +932,25 @@ def parse_args():
   parse.add_option('--with_branch_heads', action='store_true',
                     help='Always pass --with_branch_heads to gclient.  This '
                           'does the same thing as --refs +refs/branch-heads/*')
+  parse.add_option('--with_tags', action='store_true',
+                    help='Always pass --with_tags to gclient.  This '
+                          'does the same thing as --refs +refs/tags/*')
   parse.add_option('--git-cache-dir', help='Path to git cache directory.')
-
+  parse.add_option('--cleanup-dir',
+                   help='Path to a cleanup directory that can be used for '
+                        'deferred file cleanup.')
+  parse.add_option(
+      '--disable-syntax-validation', action='store_true',
+      help='Disable validation of .gclient and DEPS syntax.')
 
   options, args = parse.parse_args()
 
+  if options.spec_path:
+    if options.specs:
+      parse.error('At most one of --spec-path and --specs may be specified.')
+    with open(options.spec_path, 'r') as fd:
+      options.specs = fd.read()
+
   if not options.git_cache_dir:
     parse.error('--git-cache-dir is required')
 
@@ -952,6 +961,10 @@ def parse_args():
     options.refs.append(BRANCH_HEADS_REFSPEC)
     del options.with_branch_heads
 
+  if options.with_tags:
+    options.refs.append(TAGS_REFSPEC)
+    del options.with_tags
+
   try:
     if not options.revision_mapping_file:
       parse.error('--revision_mapping_file is required')
@@ -977,7 +990,7 @@ def prepare(options, git_slns, active):
   """Prepares the target folder before we checkout."""
   dir_names = [sln.get('name') for sln in git_slns if 'name' in sln]
   if options.clobber:
-    ensure_no_checkout(dir_names)
+    ensure_no_checkout(dir_names, options.cleanup_dir)
   # Make sure we tell recipes that we didn't run if the script exits here.
   emit_json(options.output_json, did_run=active)
 
@@ -1043,11 +1056,13 @@ def checkout(options, git_slns, specs, revisions, step_text, shallow):
           shallow=shallow,
           refs=options.refs,
           git_cache_dir=options.git_cache_dir,
-          gerrit_reset=not options.gerrit_no_reset)
+          cleanup_dir=options.cleanup_dir,
+          gerrit_reset=not options.gerrit_no_reset,
+          disable_syntax_validation=options.disable_syntax_validation)
       gclient_output = ensure_checkout(**checkout_parameters)
     except GclientSyncFailed:
       print 'We failed gclient sync, lets delete the checkout and retry.'
-      ensure_no_checkout(dir_names)
+      ensure_no_checkout(dir_names, options.cleanup_dir)
       gclient_output = ensure_checkout(**checkout_parameters)
   except PatchFailed as e:
     if options.output_json:
@@ -1055,16 +1070,12 @@ def checkout(options, git_slns, specs, revisions, step_text, shallow):
       emit_json(options.output_json,
                 did_run=True,
                 root=first_sln,
-                log_lines=[('patch error', e.output),],
                 patch_apply_return_code=e.code,
                 patch_root=options.patch_root,
                 patch_failure=True,
+                failed_patch_body=e.output,
                 step_text='%s PATCH FAILED' % step_text,
                 fixed_revisions=revisions)
-    else:
-      # If we're not on recipes, tell annotator about our got_revisions.
-      emit_log_lines('patch error', e.output)
-      print '@@@STEP_TEXT@%s PATCH FAILED@@@' % step_text
     raise
 
   # Take care of got_revisions outputs.
@@ -1076,7 +1087,7 @@ def checkout(options, git_slns, specs, revisions, step_text, shallow):
   # revision_mapping were specified on the command line then
   # default to setting 'got_revision' based on the first solution.
   if not revision_mapping:
-    revision_mapping[first_sln] = 'got_revision'
+    revision_mapping['got_revision'] = first_sln
 
   got_revisions = parse_got_revision(gclient_output, revision_mapping)
 
@@ -1088,7 +1099,6 @@ def checkout(options, git_slns, specs, revisions, step_text, shallow):
     #raise Exception('No got_revision(s) found in gclient output')
 
   if options.output_json:
-    manifest = create_manifest() if options.output_manifest else None
     # Tell recipes information such as root, got_revision, etc.
     emit_json(options.output_json,
               did_run=True,
@@ -1097,17 +1107,13 @@ def checkout(options, git_slns, specs, revisions, step_text, shallow):
               step_text=step_text,
               fixed_revisions=revisions,
               properties=got_revisions,
-              manifest=manifest)
-  else:
-    # If we're not on recipes, tell annotator about our got_revisions.
-    emit_properties(got_revisions)
+              manifest=create_manifest())
 
 
 def print_debug_info():
   print "Debugging info:"
   debug_params = {
-    'CURRENT_DIR': CURRENT_DIR,
-    'BUILDER_DIR': BUILDER_DIR,
+    'CURRENT_DIR': path.abspath(os.getcwd()),
     'THIS_DIR': THIS_DIR,
     'DEPOT_TOOLS_DIR': DEPOT_TOOLS_DIR,
   }