libv8 5.7.492.65.1 → 5.9.211.38.0beta0

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

@@ -1,18 +1,20 @@
 DEPS = [
+  'depot_tools',
   'gclient',
+  'gerrit',
+  'recipe_engine/context',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/platform',
   'recipe_engine/properties',
   'recipe_engine/python',
   'recipe_engine/raw_io',
-  'rietveld',
   'recipe_engine/step',
+  'rietveld',
   'tryserver',
 ]
 
 from recipe_engine.recipe_api import Property
-from recipe_engine.types import freeze
 
 PROPERTIES = {
   # Gerrit patches will have all properties about them prefixed with patch_.
@@ -34,7 +36,7 @@ PROPERTIES = {
   'repository': Property(default=None),
 
   # Common fields for both systems.
-  'deps_revision_overrides': Property(default=freeze({})),
+  'deps_revision_overrides': Property(default={}),
   'fail_patch': Property(default=None, kind=str),
   'parent_got_revision': Property(default=None),
   'revision': Property(default=None),

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

@@ -33,16 +33,11 @@ class BotUpdateApi(recipe_api.RecipeApi):
     assert isinstance(cmd, (list, tuple))
     bot_update_path = self.resource('bot_update.py')
     kwargs.setdefault('infra_step', True)
-    env = self.m.step.get_from_context('env', {})
-    env.setdefault('PATH', '%(PATH)s')
-    env['PATH'] = self.m.path.pathsep.join([
-        env['PATH'], str(self._module.PACKAGE_REPO_ROOT)])
-    # These are to prevent git from hanging.  If the git connection is slower
-    # than 1KB/s for more than 5 minutes then git will kill the connection
-    # and die with an error "error: RPC failed; curl 28 Operation too slow"
-    env['GIT_HTTP_LOW_SPEED_LIMIT'] = 1000
-    env['GIT_HTTP_LOW_SPEED_TIME'] = 300
-    with self.m.step.context({'env': env}):
+
+    env_prefixes = {
+        'PATH': [self.m.depot_tools.root],
+    }
+    with self.m.context(env_prefixes=env_prefixes):
       return self.m.python(name, bot_update_path, cmd, **kwargs)
 
   @property
@@ -55,10 +50,6 @@ class BotUpdateApi(recipe_api.RecipeApi):
                        gerrit_no_rebase_patch_ref=False, **kwargs):
     apply_gerrit_path = self.resource('apply_gerrit.py')
     kwargs.setdefault('infra_step', True)
-    env = self.m.step.get_from_context('env', {})
-    env.setdefault('PATH', '%(PATH)s')
-    env['PATH'] = self.m.path.pathsep.join([
-        env['PATH'], str(self._module.PACKAGE_REPO_ROOT)])
     cmd = [
         '--gerrit_repo', self._repository,
         '--gerrit_ref', self._gerrit_ref or '',
@@ -68,19 +59,23 @@ class BotUpdateApi(recipe_api.RecipeApi):
       cmd.append('--gerrit_no_reset')
     if gerrit_no_rebase_patch_ref:
       cmd.append('--gerrit_no_rebase_patch_ref')
-    with self.m.step.context({'env': env}):
+
+    env_prefixes = {
+        'PATH': [self.m.depot_tools.root],
+    }
+    with self.m.context(env_prefixes=env_prefixes):
       return self.m.python('apply_gerrit', apply_gerrit_path, cmd, **kwargs)
 
   def ensure_checkout(self, gclient_config=None, suffix=None,
                       patch=True, update_presentation=True,
                       patch_root=None, no_shallow=False,
-                      with_branch_heads=False, refs=None,
+                      with_branch_heads=False, with_tags=False, refs=None,
                       patch_oauth2=False, oauth2_json=False,
-                      use_site_config_creds=True,
-                      output_manifest=True, clobber=False,
+                      use_site_config_creds=True, clobber=False,
                       root_solution_revision=None, rietveld=None, issue=None,
                       patchset=None, gerrit_no_reset=False,
-                      gerrit_no_rebase_patch_ref=False, **kwargs):
+                      gerrit_no_rebase_patch_ref=False,
+                      disable_syntax_validation=False, **kwargs):
     """
     Args:
       use_site_config_creds: If the oauth2 credentials are in the buildbot
@@ -93,6 +88,9 @@ class BotUpdateApi(recipe_api.RecipeApi):
         the 'issue' property.
       patchset: The rietveld issue patchset to use. If omitted, will infer from
         the 'patchset' property.
+      disable_syntax_validation: (legacy) Disables syntax validation for DEPS.
+        Needed as migration paths for recipes dealing with older revisions,
+        such as bisect.
     """
     refs = refs or []
     # We can re-use the gclient spec from the gclient module, since all the
@@ -171,14 +169,16 @@ class BotUpdateApi(recipe_api.RecipeApi):
     self.m.gclient.set_patch_project_revision(
         self.m.properties.get('patch_project'), cfg)
 
-    rev_map = cfg.got_revision_mapping.as_jsonish()
+    reverse_rev_map = self.m.gclient.got_revision_reverse_mapping(cfg)
 
     flags = [
-        # What do we want to check out (spec/root/rev/rev_map).
-        ['--spec', self.m.gclient.config_to_pythonish(cfg)],
+        # What do we want to check out (spec/root/rev/reverse_rev_map).
+        ['--spec-path', self.m.raw_io.input(
+            self.m.gclient.config_to_pythonish(cfg))],
         ['--patch_root', root],
-        ['--revision_mapping_file', self.m.json.input(rev_map)],
+        ['--revision_mapping_file', self.m.json.input(reverse_rev_map)],
         ['--git-cache-dir', cfg.cache_dir],
+        ['--cleanup-dir', self.m.path['cleanup'].join('bot_update')],
 
         # How to find the patch, if any (issue/patchset).
         ['--issue', issue],
@@ -191,7 +191,8 @@ class BotUpdateApi(recipe_api.RecipeApi):
         ['--apply_issue_oauth2_file', oauth2_json_file],
 
         # Hookups to JSON output back into recipes.
-        ['--output_json', self.m.json.output()],]
+        ['--output_json', self.m.json.output()],
+    ]
 
 
     # Collect all fixed revisions to simulate them in the json output.
@@ -214,10 +215,14 @@ class BotUpdateApi(recipe_api.RecipeApi):
       revisions[cfg.solutions[0].name] = root_solution_revision
     # Allow for overrides required to bisect into rolls.
     revisions.update(self._deps_revision_overrides)
+    # Compute command-line parameters for requested revisions.
     for name, revision in sorted(revisions.items()):
       fixed_revision = self.m.gclient.resolve_revision(revision)
       if fixed_revision:
         fixed_revisions[name] = fixed_revision
+        if fixed_revision.upper() == 'HEAD':
+          # Sync to correct destination branch if HEAD was specified.
+          fixed_revision = self._destination_branch(cfg, name)
         flags.append(['--revision', '%s@%s' % (name, fixed_revision)])
 
     # Add extra fetch refspecs.
@@ -232,20 +237,22 @@ class BotUpdateApi(recipe_api.RecipeApi):
       cmd.append('--clobber')
     if no_shallow:
       cmd.append('--no_shallow')
-    if output_manifest:
-      cmd.append('--output_manifest')
     if with_branch_heads or cfg.with_branch_heads:
       cmd.append('--with_branch_heads')
+    if with_tags:
+      cmd.append('--with_tags')
     if gerrit_no_reset:
       cmd.append('--gerrit_no_reset')
     if gerrit_no_rebase_patch_ref:
       cmd.append('--gerrit_no_rebase_patch_ref')
+    if disable_syntax_validation or cfg.disable_syntax_validation:
+      cmd.append('--disable-syntax-validation')
 
     # Inject Json output for testing.
     first_sln = cfg.solutions[0].name
     step_test_data = lambda: self.test_api.output_json(
-        root, first_sln, rev_map, self._fail_patch,
-        output_manifest=output_manifest, fixed_revisions=fixed_revisions)
+        root, first_sln, reverse_rev_map, self._fail_patch,
+        fixed_revisions=fixed_revisions)
 
     # Add suffixes to the step name, if specified.
     name = 'bot_update'
@@ -260,13 +267,15 @@ class BotUpdateApi(recipe_api.RecipeApi):
       # 87 and 88 are the 'patch failure' codes for patch download and patch
       # apply, respectively. We don't actually use the error codes, and instead
       # rely on emitted json to determine cause of failure.
-      step_result = self(name, cmd, step_test_data=step_test_data,
+      step_result = self(
+           name, cmd, step_test_data=step_test_data,
            ok_ret=(0, 87, 88), **kwargs)
     except self.m.step.StepFailure as f:
       step_result = f.result
       raise
     finally:
       if step_result:
+        result = step_result.json.output
         self._last_returned_properties = step_result.json.output.get(
             'properties', {})
 
@@ -276,46 +285,158 @@ class BotUpdateApi(recipe_api.RecipeApi):
               self.last_returned_properties.iteritems()):
             step_result.presentation.properties[prop_name] = prop_value
         # Add helpful step description in the step UI.
-        if 'step_text' in step_result.json.output:
-          step_text = step_result.json.output['step_text']
+        if 'step_text' in result:
+          step_text = result['step_text']
           step_result.presentation.step_text = step_text
-        # Add log line output.
-        if 'log_lines' in step_result.json.output:
-          for log_name, log_lines in step_result.json.output['log_lines']:
-            step_result.presentation.logs[log_name] = log_lines.splitlines()
 
         # Set the "checkout" path for the main solution.
         # This is used by the Chromium module to figure out where to look for
         # the checkout.
         # If there is a patch failure, emit another step that said things
         # failed.
-        if step_result.json.output.get('patch_failure'):
-          return_code = step_result.json.output.get('patch_apply_return_code')
-          if return_code == 3:
-            # This is download failure, hence an infra failure.
-            # Sadly, python.failing_step doesn't support kwargs.
-            self.m.python.inline(
-                'Patch failure - Try Rebasing',
-                ('import sys;'
-                 'print "Patch download failed. See bot_update step for'
-                 ' details";sys.exit(1)'),
-                infra_step=True,
-                step_test_data=lambda: self.m.raw_io.test_api.output(
-                  'Patch download failed. See bot_update step for details',
-                  retcode=1)
-                )
-          else:
-            # This is actual patch failure.
-            self.m.tryserver.set_patch_failure_tryjob_result()
-            self.m.python.failing_step(
-                'Patch failure', 'Check the bot_update step for details')
+        if result.get('patch_failure'):
+          return_code = result.get('patch_apply_return_code')
+          patch_body = result.get('failed_patch_body')
+          try:
+            if return_code == 3:
+              # This is download failure, hence an infra failure.
+              with self.m.context(infra_steps=True):
+                self.m.python.failing_step(
+                    'Patch failure', 'Git reported a download failure')
+            else:
+              # This is actual patch failure.
+              self.m.tryserver.set_patch_failure_tryjob_result()
+              self.m.python.failing_step(
+                  'Patch failure', 'See attached log. Try rebasing?')
+          except self.m.step.StepFailure as e:
+            if patch_body:
+              e.result.presentation.logs['patch error'] = (
+                  patch_body.splitlines())
+            raise e
 
         # bot_update actually just sets root to be the folder name of the
         # first solution.
-        if step_result.json.output['did_run']:
-          co_root = step_result.json.output['root']
-          cwd = self.m.step.get_from_context('cwd', self.m.path['start_dir'])
-          if 'checkout' not in self.m.path:
-            self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep))
+        if result['did_run'] and 'checkout' not in self.m.path:
+          co_root = result['root']
+          cwd = self.m.context.cwd or self.m.path['start_dir']
+          self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep))
 
     return step_result
+
+  def _destination_branch(self, cfg, path):
+    """Returns the destination branch of a CL for the matching project
+    if available or HEAD otherwise.
+
+    This is a noop if there's no Gerrit CL associated with the run.
+    Otherwise this queries Gerrit for the correct destination branch, which
+    might differ from master.
+
+    Args:
+      cfg: The used gclient config.
+      path: The DEPS path of the project this prefix is for. E.g. 'src' or
+          'src/v8'. The query will only be made for the project that matches
+          the CL's project.
+    Returns:
+        A destination branch as understood by bot_update.py if available
+        and if different from master, returns 'HEAD' otherwise.
+    """
+    # Bail out if this is not a gerrit issue.
+    if (not self.m.tryserver.is_gerrit_issue or
+        not self._gerrit or not self._issue):
+      return 'HEAD'
+
+    # Ignore other project paths than the one belonging to the CL.
+    if path != cfg.patch_projects.get(
+        self.m.properties.get('patch_project'),
+        (cfg.solutions[0].name, None))[0]:
+      return 'HEAD'
+
+    # Query Gerrit to check if a CL's destination branch differs from master.
+    destination_branch = self.m.gerrit.get_change_destination_branch(
+        host=self._gerrit,
+        change=self._issue,
+        name='get_patch_destination_branch',
+    )
+
+    # Only use prefix if different from bot_update.py's default.
+    return destination_branch if destination_branch != 'master' else 'HEAD'
+
+  def _resolve_fixed_revisions(self, bot_update_json):
+    """Set all fixed revisions from the first sync to their respective
+    got_X_revision values.
+
+    If on the first sync, a revision was requested to be HEAD, this avoids
+    using HEAD potentially resolving to a different revision on the second
+    sync. Instead, we sync explicitly to whatever was checked out the first
+    time.
+
+    Example (chromium trybot used with v8 patch):
+
+    First sync was called with
+    bot_update.py --revision src@abc --revision src/v8@HEAD
+    Fixed revisions are: src, src/v8
+    Got_revision_mapping: src->got_revision, src/v8->got_v8_revision
+    got_revision = abc, got_v8_revision = deadbeef
+    Second sync will be called with
+    bot_update.py --revision src@abc --revision src/v8@deadbeef
+
+    Example (chromium trybot used with chromium DEPS change, changing v8 from
+    "v8_before" to "v8_after"):
+
+    First sync was called with
+    bot_update.py --revision src@abc
+    Fixed revisions are: src
+    Got_revision_mapping: src->got_revision, src/v8->got_v8_revision
+    got_revision = abc, got_v8_revision = v8_after
+    Second sync will be called with
+    bot_update.py --revision src@abc
+    When deapplying the patch, v8 will be synced to v8_before.
+    """
+    for name in bot_update_json.get('fixed_revisions', {}):
+      rev_properties = self.get_project_revision_properties(name)
+      if (rev_properties and
+          bot_update_json['properties'].get(rev_properties[0])):
+        self.m.gclient.c.revisions[name] = str(
+            bot_update_json['properties'][rev_properties[0]])
+
+  # TODO(machenbach): Replace usages of this method eventually by direct calls
+  # to the manifest output.
+  def get_project_revision_properties(self, project_name, gclient_config=None):
+    """Returns all property names used for storing the checked-out revision of
+    a given project.
+
+    Args:
+      project_name (str): The name of a checked-out project as deps path, e.g.
+          src or src/v8.
+      gclient_config: The gclient configuration to use. If omitted, the current
+          gclient configuration is used.
+
+    Returns (list of str): All properties that'll hold the checked-out revision
+        of the given project. An empty list if no such properties exist.
+    """
+    cfg = gclient_config or self.m.gclient.c
+    # Sort for determinism. We might have several properties for the same
+    # project, e.g. got_revision and got_webrtc_revision.
+    rev_reverse_map = self.m.gclient.got_revision_reverse_mapping(cfg)
+    return sorted(
+        prop
+        for prop, project in rev_reverse_map.iteritems()
+        if project == project_name
+    )
+
+  def deapply_patch(self, bot_update_step):
+    """Deapplies a patch, taking care of DEPS and solution revisions properly.
+    """
+    bot_update_json = bot_update_step.json.output
+    # We only override first solution here to make sure that we correctly revert
+    # changes to DEPS file, which is particularly important for auto-rolls. It
+    # is also imporant that we do not assume that corresponding revision is
+    # stored in the 'got_revision' as some gclient configs change the default
+    # mapping for their own purposes.
+    first_solution_name = self.m.gclient.c.solutions[0].name
+    rev_property = self.get_project_revision_properties(first_solution_name)[0]
+    self.m.gclient.c.revisions[first_solution_name] = str(
+        bot_update_json['properties'][rev_property])
+    self._resolve_fixed_revisions(bot_update_json)
+
+    self.ensure_checkout(patch=False, update_presentation=False)

data/vendor/depot_tools/recipes/recipe_modules/bot_update/{example.expected → examples/full.expected}/apply_gerrit_ref.json

@@ -13,8 +13,10 @@
       "--gerrit_no_reset",
       "--gerrit_no_rebase_patch_ref"
     ],
-    "env": {
-      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
     },
     "infra_step": true,
     "name": "apply_gerrit"

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

@@ -0,0 +1,82 @@
+[
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
+      "--spec-path",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
+      "--patch_root",
+      "src",
+      "--revision_mapping_file",
+      "{\"got_angle_revision\": \"src/third_party/angle\", \"got_cr_revision\": \"src\", \"got_revision\": \"src\", \"got_v8_revision\": \"src/v8\"}",
+      "--git-cache-dir",
+      "[GIT_CACHE]",
+      "--cleanup-dir",
+      "[CLEANUP]/bot_update",
+      "--output_json",
+      "/path/to/tmp/json",
+      "--revision",
+      "src@abc",
+      "--disable-syntax-validation"
+    ],
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "bot_update (without patch)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Some step text@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": \"abc\"@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src/third_party/angle\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src/v8\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src/v8.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_cr_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\"@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"root\": \"src\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"step_text\": \"Some step text\"@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@",
+      "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
+      "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@",
+      "@@@SET_BUILD_PROPERTY@got_cr_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
+      "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
+      "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@"
+    ]
+  },
+  {
+    "name": "$result",
+    "recipe_result": null,
+    "status_code": 0
+  }
+]