libv8 7.3.492.27.1 → 8.4.255.0

data/vendor/depot_tools/recipes/recipe_modules/gclient/api.py

@@ -2,8 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import re
 from recipe_engine import recipe_api
 
+class DepsDiffException(Exception):
+  pass
 
 class RevisionResolver(object):
   """Resolves the revision based on build properties."""
@@ -114,7 +117,7 @@ class GclientApi(recipe_api.RecipeApi):
   def get_config_defaults(self):
     return {
       'USE_MIRROR': self.use_mirror,
-      'CACHE_DIR': self.m.infra_paths.default_git_cache_dir,
+      'CACHE_DIR': self.m.path['cache'].join('git'),
     }
 
   @staticmethod
@@ -133,7 +136,7 @@ class GclientApi(recipe_api.RecipeApi):
     rev_map = cfg.got_revision_mapping.as_jsonish()
     reverse_rev_map = cfg.got_revision_reverse_mapping.as_jsonish()
     combined_length = len(rev_map) + len(reverse_rev_map)
-    reverse_rev_map.update({v: k for k, v in rev_map.iteritems()})
+    reverse_rev_map.update({v: k for k, v in rev_map.items()})
 
     # Make sure we never have duplicate values in the old map.
     assert combined_length == len(reverse_rev_map)
@@ -192,13 +195,14 @@ class GclientApi(recipe_api.RecipeApi):
                  **kwargs)
     finally:
       result = self.m.step.active_result
-      solutions = result.json.output['solutions']
-      for propname, path in sorted(
-          self.got_revision_reverse_mapping(cfg).iteritems()):
-        # gclient json paths always end with a slash
-        info = solutions.get(path + '/') or solutions.get(path)
-        if info:
-          result.presentation.properties[propname] = info['revision']
+      if result.json.output is not None:
+        solutions = result.json.output['solutions']
+        for propname, path in sorted(
+            self.got_revision_reverse_mapping(cfg).items()):
+          # gclient json paths always end with a slash
+          info = solutions.get(path + '/') or solutions.get(path)
+          if info:
+            result.presentation.properties[propname] = info['revision']
 
     return result
 
@@ -213,7 +217,7 @@ class GclientApi(recipe_api.RecipeApi):
     """
     cfg = gclient_config or self.c
 
-    for prop, custom_var in cfg.parent_got_revision_mapping.iteritems():
+    for prop, custom_var in cfg.parent_got_revision_mapping.items():
       val = str(self.m.properties.get(prop, ''))
       # TODO(infra): Fix coverage.
       if val:  # pragma: no cover
@@ -282,7 +286,7 @@ class GclientApi(recipe_api.RecipeApi):
             for cur_file in files:
               if cur_file.endswith('index.lock'):
                 path_to_file = os.path.join(path, cur_file)
-                print 'deleting %s' % path_to_file
+                print('deleting %s' % path_to_file)
                 os.remove(path_to_file)
       """,
       args=[self.m.path['start_dir']],
@@ -336,7 +340,7 @@ class GclientApi(recipe_api.RecipeApi):
       return rel_path
 
     # repo_path_map keys may be non-canonical.
-    for key, (rel_path, _) in cfg.repo_path_map.iteritems():
+    for key, (rel_path, _) in cfg.repo_path_map.items():
       if self._canonicalize_repo_url(key) == repo_url:
         return rel_path
 
@@ -347,7 +351,7 @@ class GclientApi(recipe_api.RecipeApi):
     return None
 
   def set_patch_repo_revision(self, gclient_config=None):
-    """Updates config revision corresponding to patch_project.
+    """Updates config revision corresponding to patched project.
 
     Useful for bot_update only, as this is the only consumer of gclient's config
     revision map. This doesn't overwrite the revision if it was already set.
@@ -357,3 +361,68 @@ class GclientApi(recipe_api.RecipeApi):
     path, revision = cfg.repo_path_map.get(repo_url, (None, None))
     if path and revision and path not in cfg.revisions:
       cfg.revisions[path] = revision
+
+  def diff_deps(self, cwd):
+    cwd = cwd.join(self.get_gerrit_patch_root())
+    with self.m.context(cwd=cwd):
+      step_result = self.m.git(
+          '-c',
+          'core.quotePath=false',
+          'checkout',
+          'HEAD~',
+          '--',
+          'DEPS',
+          name='checkout the previous DEPS',
+          stdout=self.m.raw_io.output()
+      )
+
+      try:
+        cfg = self.c
+
+        step_result = self(
+            'recursively git diff all DEPS',
+            [
+                'recurse',
+                self.resource('diff_deps.py'),
+            ],
+            stdout=self.m.raw_io.output_text(add_output_log=True),
+        )
+
+        paths = []
+        # gclient recurse prepends a number and a > to each line
+        # Let's take that out
+        for line in step_result.stdout.strip().splitlines():
+          if 'fatal: bad object' in line:
+            msg = "Couldn't checkout previous ref: %s" % line
+            step_result.presentation.logs['DepsDiffException'] = msg
+            raise self.DepsDiffException(msg)
+          elif re.match('\d+>', line):
+            paths.append(line[line.index('>') + 1:])
+
+
+        # Normalize paths
+        if self.m.platform.is_win:
+          # Looks like "analyze" wants POSIX slashes even on Windows (since git
+          # uses that format even on Windows).
+          paths = [path.replace('\\', '/') for path in paths]
+
+        if len(paths) > 0:
+          return paths
+        else:
+          msg = 'Unexpected result: autoroll diff found 0 files changed'
+          step_result.presentation.logs['DepsDiffException'] = msg
+          raise self.DepsDiffException(msg)
+
+      finally:
+        self.m.git(
+            '-c',
+            'core.quotePath=false',
+            'checkout',
+            'HEAD',
+            '--',
+            'DEPS',
+            name="checkout the original DEPS")
+
+  @property
+  def DepsDiffException(self):
+    return DepsDiffException

data/vendor/depot_tools/recipes/recipe_modules/gclient/config.py

@@ -11,14 +11,14 @@ from . import api as gclient_api
 
 
 def BaseConfig(USE_MIRROR=True, CACHE_DIR=None,
-               BUILDSPEC_VERSION=None, **_kwargs):
+               BUILDSPEC_VERSION=None, deps_file='.DEPS.git', **_kwargs):
   cache_dir = str(CACHE_DIR) if CACHE_DIR else None
   return ConfigGroup(
     solutions = ConfigList(
       lambda: ConfigGroup(
         name = Single(basestring),
         url = Single((basestring, type(None)), empty_val=''),
-        deps_file = Single(basestring, empty_val='.DEPS.git', required=False,
+        deps_file = Single(basestring, empty_val=deps_file, required=False,
                            hidden=False),
         managed = Single(bool, empty_val=True, required=False, hidden=False),
         custom_deps = Dict(value_type=(basestring, types.NoneType)),
@@ -50,7 +50,7 @@ def BaseConfig(USE_MIRROR=True, CACHE_DIR=None,
     # Maps build_property -> 'solution'
     got_revision_reverse_mapping = Dict(hidden=True),
 
-    # Addition revisions we want to pass in.  For now theres a duplication
+    # Addition revisions we want to pass in.  For now there's a duplication
     # of code here of setting custom vars AND passing in --revision. We hope
     # to remove custom vars later.
     revisions = Dict(
@@ -153,10 +153,10 @@ def wasm_llvm(c):
 @config_ctx()
 def emscripten_releases(c):
   s = c.solutions.add()
-  s.name = 'emscripten_releases'
+  s.name = 'emscripten-releases'
   s.url = ChromiumGitURL(c, 'emscripten-releases.git')
   m = c.got_revision_mapping
-  m['emscripten_releases'] = 'got_revision'
+  m['emscripten-releases'] = 'got_revision'
 
 @config_ctx()
 def gyp(c):
@@ -262,12 +262,6 @@ def pdfium(c):
   m = c.got_revision_mapping
   m['pdfium'] = 'got_revision'
 
-@config_ctx()
-def mojo(c):
-  soln = c.solutions.add()
-  soln.name = 'src'
-  soln.url = 'https://chromium.googlesource.com/external/mojo.git'
-
 @config_ctx()
 def crashpad(c):
   soln = c.solutions.add()
@@ -448,3 +442,21 @@ def openscreen(c):
   s.name = 'openscreen'
   s.url = 'https://chromium.googlesource.com/openscreen'
   c.got_revision_mapping['openscreen'] = 'got_revision'
+
+@config_ctx()
+def devtools(c):
+  s = c.solutions.add()
+  s.name = 'devtools'
+  s.url = 'https://chromium.googlesource.com/devtools/devtools-frontend.git'
+  c.got_revision_mapping['devtools'] = 'got_revision'
+  c.repo_path_map.update({
+      'https://chromium.googlesource.com/devtools/devtools-frontend': (
+          'devtools/devtools-frontend', 'HEAD'),
+  })
+
+@config_ctx()
+def tint(c):
+  soln = c.solutions.add()
+  soln.name = 'tint'
+  soln.url = 'https://dawn.googlesource.com/tint.git'
+  c.got_revision_mapping['tint'] = 'got_revision'

data/vendor/depot_tools/recipes/recipe_modules/gclient/examples/full.expected/basic.json

@@ -6,7 +6,7 @@
       "RECIPE_REPO[depot_tools]/gclient.py",
       "config",
       "--spec",
-      "cache_dir = '[ROOT]/git_cache'\nsolutions = [{'custom_vars': {'string_var': 'string_val', 'true_var': True}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
+      "cache_dir = '[CACHE]/git'\nsolutions = [{'custom_vars': {'string_var': 'string_val', 'true_var': True}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
     ],
     "env_suffixes": {
       "PATH": [
@@ -197,7 +197,7 @@
     "cmd": [
       "python",
       "-u",
-      "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n  for (path, dir, files) in os.walk(build_path):\n    for cur_file in files:\n      if cur_file.endswith('index.lock'):\n        path_to_file = os.path.join(path, cur_file)\n        print 'deleting %s' % path_to_file\n        os.remove(path_to_file)\n",
+      "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n  for (path, dir, files) in os.walk(build_path):\n    for cur_file in files:\n      if cur_file.endswith('index.lock'):\n        path_to_file = os.path.join(path, cur_file)\n        print('deleting %s' % path_to_file)\n        os.remove(path_to_file)\n",
       "[START_DIR]"
     ],
     "infra_step": true,
@@ -212,7 +212,7 @@
       "@@@STEP_LOG_LINE@python.inline@    for cur_file in files:@@@",
       "@@@STEP_LOG_LINE@python.inline@      if cur_file.endswith('index.lock'):@@@",
       "@@@STEP_LOG_LINE@python.inline@        path_to_file = os.path.join(path, cur_file)@@@",
-      "@@@STEP_LOG_LINE@python.inline@        print 'deleting %s' % path_to_file@@@",
+      "@@@STEP_LOG_LINE@python.inline@        print('deleting %s' % path_to_file)@@@",
       "@@@STEP_LOG_LINE@python.inline@        os.remove(path_to_file)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
@@ -233,7 +233,6 @@
     "name": "gclient runhooks"
   },
   {
-    "jsonResult": null,
     "name": "$result"
   }
 ]

data/vendor/depot_tools/recipes/recipe_modules/gclient/examples/full.expected/revision.json

@@ -6,7 +6,7 @@
       "RECIPE_REPO[depot_tools]/gclient.py",
       "config",
       "--spec",
-      "cache_dir = '[ROOT]/git_cache'\nsolutions = [{'custom_vars': {'string_var': 'string_val', 'true_var': True}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
+      "cache_dir = '[CACHE]/git'\nsolutions = [{'custom_vars': {'string_var': 'string_val', 'true_var': True}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
     ],
     "env_suffixes": {
       "PATH": [
@@ -128,8 +128,6 @@
       "--with_tags",
       "--delete_unversioned_trees",
       "--revision",
-      "Angle@abc",
-      "--revision",
       "src/third_party/angle@refs/heads/lkgr",
       "--output-json",
       "/path/to/tmp/json"
@@ -201,7 +199,7 @@
     "cmd": [
       "python",
       "-u",
-      "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n  for (path, dir, files) in os.walk(build_path):\n    for cur_file in files:\n      if cur_file.endswith('index.lock'):\n        path_to_file = os.path.join(path, cur_file)\n        print 'deleting %s' % path_to_file\n        os.remove(path_to_file)\n",
+      "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n  for (path, dir, files) in os.walk(build_path):\n    for cur_file in files:\n      if cur_file.endswith('index.lock'):\n        path_to_file = os.path.join(path, cur_file)\n        print('deleting %s' % path_to_file)\n        os.remove(path_to_file)\n",
       "[START_DIR]"
     ],
     "infra_step": true,
@@ -216,7 +214,7 @@
       "@@@STEP_LOG_LINE@python.inline@    for cur_file in files:@@@",
       "@@@STEP_LOG_LINE@python.inline@      if cur_file.endswith('index.lock'):@@@",
       "@@@STEP_LOG_LINE@python.inline@        path_to_file = os.path.join(path, cur_file)@@@",
-      "@@@STEP_LOG_LINE@python.inline@        print 'deleting %s' % path_to_file@@@",
+      "@@@STEP_LOG_LINE@python.inline@        print('deleting %s' % path_to_file)@@@",
       "@@@STEP_LOG_LINE@python.inline@        os.remove(path_to_file)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
@@ -237,7 +235,6 @@
     "name": "gclient runhooks"
   },
   {
-    "jsonResult": null,
     "name": "$result"
   }
 ]

data/vendor/depot_tools/recipes/recipe_modules/gclient/examples/full.expected/tryserver.json

@@ -6,7 +6,7 @@
       "RECIPE_REPO[depot_tools]/gclient.py",
       "config",
       "--spec",
-      "cache_dir = '[ROOT]/git_cache'\nsolutions = [{'custom_vars': {'string_var': 'string_val', 'true_var': True}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
+      "cache_dir = '[CACHE]/git'\nsolutions = [{'custom_vars': {'string_var': 'string_val', 'true_var': True}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
     ],
     "env_suffixes": {
       "PATH": [
@@ -197,7 +197,7 @@
     "cmd": [
       "python",
       "-u",
-      "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n  for (path, dir, files) in os.walk(build_path):\n    for cur_file in files:\n      if cur_file.endswith('index.lock'):\n        path_to_file = os.path.join(path, cur_file)\n        print 'deleting %s' % path_to_file\n        os.remove(path_to_file)\n",
+      "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n  for (path, dir, files) in os.walk(build_path):\n    for cur_file in files:\n      if cur_file.endswith('index.lock'):\n        path_to_file = os.path.join(path, cur_file)\n        print('deleting %s' % path_to_file)\n        os.remove(path_to_file)\n",
       "[START_DIR]"
     ],
     "infra_step": true,
@@ -212,7 +212,7 @@
       "@@@STEP_LOG_LINE@python.inline@    for cur_file in files:@@@",
       "@@@STEP_LOG_LINE@python.inline@      if cur_file.endswith('index.lock'):@@@",
       "@@@STEP_LOG_LINE@python.inline@        path_to_file = os.path.join(path, cur_file)@@@",
-      "@@@STEP_LOG_LINE@python.inline@        print 'deleting %s' % path_to_file@@@",
+      "@@@STEP_LOG_LINE@python.inline@        print('deleting %s' % path_to_file)@@@",
       "@@@STEP_LOG_LINE@python.inline@        os.remove(path_to_file)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
@@ -233,7 +233,6 @@
     "name": "gclient runhooks"
   },
   {
-    "jsonResult": null,
     "name": "$result"
   }
 ]

data/vendor/depot_tools/recipes/recipe_modules/gclient/examples/full.py

@@ -4,6 +4,7 @@
 
 DEPS = [
   'gclient',
+  'recipe_engine/buildbucket',
   'recipe_engine/context',
   'recipe_engine/path',
   'recipe_engine/properties',
@@ -36,13 +37,14 @@ TEST_CONFIGS = [
   'luci_go',
   'luci_py',
   'master_deps',
-  'mojo',
   'nacl',
+  'devtools',
   'openscreen',
   'pdfium',
   'recipes_py',
   'recipes_py_bare',
   'slave_deps',
+  'tint',
   'wasm_llvm',
   'webports',
   'with_branch_heads',
@@ -54,11 +56,11 @@ def RunSteps(api):
   for config_name in TEST_CONFIGS:
     api.gclient.make_config(config_name)
 
-  src_cfg = api.gclient.make_config(CACHE_DIR='[ROOT]/git_cache')
+  src_cfg = api.gclient.make_config(CACHE_DIR=api.path['cache'].join('git'))
   soln = src_cfg.solutions.add()
   soln.name = 'src'
   soln.url = 'https://chromium.googlesource.com/chromium/src.git'
-  soln.revision = api.properties.get('revision')
+  soln.revision = api.buildbucket.gitiles_commit.id
   soln.custom_vars = {'string_var': 'string_val', 'true_var': True}
   src_cfg.parent_got_revision_mapping['parent_got_revision'] = 'got_revision'
   api.gclient.c = src_cfg
@@ -88,8 +90,6 @@ def RunSteps(api):
 def GenTests(api):
   yield api.test('basic')
 
-  yield api.test('buildbot') + api.properties(path_config='buildbot')
+  yield api.test('revision') + api.buildbucket.ci_build(revision='abc')
 
-  yield api.test('revision') + api.properties(revision='abc')
-
-  yield api.test('tryserver') + api.properties.tryserver()
+  yield api.test('tryserver') + api.buildbucket.try_build()

data/vendor/depot_tools/recipes/recipe_modules/gclient/resources/diff_deps.py

@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+import os
+import subprocess
+import sys
+
+if '@' in os.environ.get('GCLIENT_URL'):
+  ref = os.environ.get('GCLIENT_URL').split('@')[-1]
+else:
+  sys.exit(0)
+
+diff = subprocess.check_output("git diff --cached --name-only %s" % ref, shell=True)
+
+dep_path = os.environ.get('GCLIENT_DEP_PATH', '')
+for line in diff.splitlines():
+  if line:
+    print(os.path.join(dep_path,  line))

data/vendor/depot_tools/recipes/recipe_modules/gclient/test_api.py

@@ -7,6 +7,10 @@ import hashlib
 from recipe_engine import recipe_test_api
 
 class GclientTestApi(recipe_test_api.RecipeTestApi):
+  def diff_deps_test_data(self, files):
+    return self.m.raw_io.stream_output(
+        '\n'.join(['10>%s' % fname for fname in files]))
+
   def output_json(self, projects):
     """Deterministically synthesize json.output test data for gclient's
     --output-json option.

data/vendor/depot_tools/recipes/recipe_modules/gclient/tests/diff_deps.expected/basic.json

@@ -0,0 +1,55 @@
+[
+  {
+    "cmd": [
+      "git",
+      "-c",
+      "core.quotePath=false",
+      "checkout",
+      "HEAD~",
+      "--",
+      "DEPS"
+    ],
+    "cwd": "[CACHE]/src",
+    "infra_step": true,
+    "name": "checkout the previous DEPS"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_REPO[depot_tools]/gclient.py",
+      "recurse",
+      "RECIPE_MODULE[depot_tools::gclient]/resources/diff_deps.py"
+    ],
+    "cwd": "[CACHE]/src",
+    "env_suffixes": {
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gclient recursively git diff all DEPS",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@raw_io.output_text@10>third_party/mockfile1@@@",
+      "@@@STEP_LOG_LINE@raw_io.output_text@10>third_party/mockfile2@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "git",
+      "-c",
+      "core.quotePath=false",
+      "checkout",
+      "HEAD",
+      "--",
+      "DEPS"
+    ],
+    "cwd": "[CACHE]/src",
+    "infra_step": true,
+    "name": "checkout the original DEPS"
+  },
+  {
+    "name": "$result"
+  }
+]