libv8 6.3.292.48.1 → 6.7.288.46.0

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

@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-
 """Recipe module to ensure a checkout is consistent on a bot."""
 
 from recipe_engine import recipe_api
@@ -10,16 +9,17 @@ from recipe_engine import recipe_api
 
 class BotUpdateApi(recipe_api.RecipeApi):
 
-  def __init__(self, issue, patch_issue, patchset, patch_set,
+  def __init__(self, properties, patch_issue, patch_set,
                repository, patch_repository_url, gerrit_ref, patch_ref,
-               patch_gerrit_url, rietveld, revision, parent_got_revision,
+               patch_gerrit_url, revision, parent_got_revision,
                deps_revision_overrides, fail_patch, *args, **kwargs):
-    self._issue = issue or patch_issue
-    self._patchset = patchset or patch_set
+    self._apply_patch_on_gclient = properties.get(
+        'apply_patch_on_gclient', True)
+    self._issue = patch_issue
+    self._patchset = patch_set
     self._repository = repository or patch_repository_url
     self._gerrit_ref = gerrit_ref or patch_ref
     self._gerrit = patch_gerrit_url
-    self._rietveld = rietveld
     self._revision = revision
     self._parent_got_revision = parent_got_revision
     self._deps_revision_overrides = deps_revision_overrides
@@ -67,10 +67,10 @@ class BotUpdateApi(recipe_api.RecipeApi):
 
   def ensure_checkout(self, gclient_config=None, suffix=None,
                       patch=True, update_presentation=True,
-                      patch_root=None, no_shallow=False,
+                      patch_root=None, no_shallow=True,
                       with_branch_heads=False, with_tags=False, refs=None,
-                      patch_oauth2=False, oauth2_json=False,
-                      use_site_config_creds=True, clobber=False,
+                      patch_oauth2=None, oauth2_json=None,
+                      use_site_config_creds=None, clobber=False,
                       root_solution_revision=None, rietveld=None, issue=None,
                       patchset=None, gerrit_no_reset=False,
                       gerrit_no_rebase_patch_ref=False,
@@ -78,22 +78,21 @@ class BotUpdateApi(recipe_api.RecipeApi):
                       **kwargs):
     """
     Args:
-      use_site_config_creds: If the oauth2 credentials are in the buildbot
-        site_config. See crbug.com/624212 for more information.
       gclient_config: The gclient configuration to use when running bot_update.
         If omitted, the current gclient configuration is used.
-      rietveld: The rietveld server to use. If omitted, will infer from
-        the 'rietveld' property.
-      issue: The rietveld issue number to use. If omitted, will infer from
-        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.
       manifest_name: The name of the manifest to upload to LogDog.  This must
         be unique for the whole build.
     """
+    assert use_site_config_creds is None, "use_site_config_creds is deprecated"
+    assert rietveld is None, "rietveld is deprecated"
+    assert issue is None, "issue is deprecated"
+    assert patchset is None, "patchset is deprecated"
+    assert patch_oauth2 is None, "patch_oauth2 is deprecated"
+    assert oauth2_json is None, "oauth2_json is deprecated"
+
     refs = refs or []
     # We can re-use the gclient spec from the gclient module, since all the
     # data bot_update needs is already configured into the gclient spec.
@@ -101,8 +100,6 @@ class BotUpdateApi(recipe_api.RecipeApi):
     assert cfg is not None, (
         'missing gclient_config or forgot api.gclient.set_config(...) before?')
 
-    # Only one of these should exist.
-    assert not (oauth2_json and patch_oauth2)
 
     # Construct our bot_update command.  This basically be inclusive of
     # everything required for bot_update to know:
@@ -112,58 +109,19 @@ class BotUpdateApi(recipe_api.RecipeApi):
           self.m.properties.get('patch_project'), cfg, self._repository)
 
     if patch:
-      issue = issue or self._issue
       patchset = patchset or self._patchset
       gerrit_repo = self._repository
       gerrit_ref = self._gerrit_ref
     else:
       # The trybot recipe sometimes wants to de-apply the patch. In which case
       # we pretend the issue/patchset never existed.
-      issue = patchset = email_file = key_file = None
       gerrit_repo = gerrit_ref = None
 
-    # Issue and patchset must come together.
-    if issue:
-      assert patchset
-    if patchset:
-      assert issue
-
     # The gerrit_ref and gerrit_repo must be together or not at all.  If one is
     # missing, clear both of them.
     if not gerrit_ref or not gerrit_repo:
       gerrit_repo = gerrit_ref = None
     assert (gerrit_ref != None) == (gerrit_repo != None)
-    if gerrit_ref:
-      # Gerrit patches have historically not specified issue and patchset.
-      # resourece/bot_update has as a result implicit assumption that set issue
-      # implies Rietveld patch.
-      # TODO(tandrii): fix this madness.
-      issue = patchset = None
-
-    # Point to the oauth2 auth files if specified.
-    # These paths are where the bots put their credential files.
-    oauth2_json_file = email_file = key_file = None
-    if oauth2_json:
-      if self.m.platform.is_win:
-        oauth2_json_file = 'C:\\creds\\refresh_tokens\\internal-try'
-      else:
-        oauth2_json_file = '/creds/refresh_tokens/internal-try'
-    elif patch_oauth2:
-      # TODO(martiniss): remove this hack :(. crbug.com/624212
-      if use_site_config_creds:
-        try:
-          build_path = self.m.path['build']
-        except KeyError:
-          raise self.m.step.StepFailure(
-              'build path is not defined. This is normal for LUCI builds. '
-              'In LUCI, use_site_config_creds parameter of '
-              'bot_update.ensure_checkout is not supported')
-        email_file = build_path.join('site_config', '.rietveld_client_email')
-        key_file = build_path.join('site_config', '.rietveld_secret_key')
-      else: #pragma: no cover
-        #TODO(martiniss): make this use path.join, so it works on windows
-        email_file = '/creds/rietveld/client_email'
-        key_file = '/creds/rietveld/secret_key'
 
     # Allow patch_project's revision if necessary.
     # This is important for projects which are checked out as DEPS of the
@@ -182,15 +140,9 @@ class BotUpdateApi(recipe_api.RecipeApi):
         ['--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],
-        ['--patchset', patchset],
-        ['--rietveld_server', rietveld or self._rietveld],
+        # How to find the patch, if any
         ['--gerrit_repo', gerrit_repo],
         ['--gerrit_ref', gerrit_ref],
-        ['--apply_issue_email_file', email_file],
-        ['--apply_issue_key_file', key_file],
-        ['--apply_issue_oauth2_file', oauth2_json_file],
 
         # Hookups to JSON output back into recipes.
         ['--output_json', self.m.json.output()],
@@ -230,8 +182,22 @@ class BotUpdateApi(recipe_api.RecipeApi):
         if fixed_revision.upper() == 'HEAD':
           # Sync to correct destination branch if HEAD was specified.
           fixed_revision = self._destination_branch(cfg, name)
+        # If we're syncing to a ref, we want to make sure it exists before
+        # trying to check it out.
+        if fixed_revision.startswith('refs/'):
+          # Handle the "ref:revision" syntax, e.g.
+          # refs/branch-heads/4.2:deadbeef
+          refs.append(fixed_revision.split(':')[0])
         flags.append(['--revision', '%s@%s' % (name, fixed_revision)])
 
+    for ref in refs:
+      assert not ref.startswith('refs/remotes/'), (
+          'The "refs/remotes/*" syntax is not supported.\n'
+          'The "remotes" syntax is dependent on the way the local repo is '
+          'configured, and while there are defaults that can often be '
+          'assumed, there is no guarantee the mapping will always be done in '
+          'a particular way.')
+
     # Add extra fetch refspecs.
     for ref in refs:
       flags.append(['--refs', ref])
@@ -242,11 +208,11 @@ class BotUpdateApi(recipe_api.RecipeApi):
 
     if clobber:
       cmd.append('--clobber')
-    if no_shallow:
-      cmd.append('--no_shallow')
+    if no_shallow is False:
+      cmd.append('--maybe_shallow')
     if with_branch_heads or cfg.with_branch_heads:
       cmd.append('--with_branch_heads')
-    if with_tags:
+    if with_tags or cfg.with_tags:
       cmd.append('--with_tags')
     if gerrit_no_reset:
       cmd.append('--gerrit_no_reset')
@@ -254,6 +220,8 @@ class BotUpdateApi(recipe_api.RecipeApi):
       cmd.append('--gerrit_no_rebase_patch_ref')
     if disable_syntax_validation or cfg.disable_syntax_validation:
       cmd.append('--disable-syntax-validation')
+    if not self._apply_patch_on_gclient:
+      cmd.append('--no-apply-patch-on-gclient')
 
     # Inject Json output for testing.
     first_sln = cfg.solutions[0].name

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

@@ -14,12 +14,6 @@
       "[GIT_CACHE]",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
-      "--issue",
-      "12345",
-      "--patchset",
-      "654321",
-      "--rietveld_server",
-      "https://rietveld.example.com/",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -86,8 +80,6 @@
       "[GIT_CACHE]",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
-      "--rietveld_server",
-      "https://rietveld.example.com/",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",

data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/{trychange_oauth2_json.json → no_apply_patch_on_gclient.json}

@@ -1,4 +1,48 @@
 [
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
+      "changes",
+      "--host",
+      "https://chromium-review.googlesource.com",
+      "--json_file",
+      "/path/to/tmp/json",
+      "--limit",
+      "1",
+      "-p",
+      "change=338811"
+    ],
+    "env": {
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "gerrit get_patch_destination_branch",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@[@@@",
+      "@@@STEP_LOG_LINE@json.output@  {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"_number\": \"91827\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"branch\": \"master\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"change_id\": \"Ideadbeef\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"created\": \"2017-01-30 13:11:20.000000000\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"has_review_started\": false, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"project\": \"chromium/src\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"revisions\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"184ebe53805e102605d11f6b143486d15c23a09c\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"_number\": \"1\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"commit\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@          \"message\": \"Change commit message\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        }@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    }, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"status\": \"NEW\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"subject\": \"Change title\"@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@]@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
   {
     "cmd": [
       "python",
@@ -7,20 +51,25 @@
       "--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",
+      "src/third_party/angle",
       "--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",
-      "--apply_issue_oauth2_file",
-      "/creds/refresh_tokens/internal-try",
+      "--gerrit_repo",
+      "https://chromium.googlesource.com/angle/angle",
+      "--gerrit_ref",
+      "refs/changes/11/338811/3",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
       "src@HEAD",
-      "--disable-syntax-validation"
+      "--revision",
+      "src/third_party/angle@HEAD",
+      "--disable-syntax-validation",
+      "--no-apply-patch-on-gclient"
     ],
     "env_prefixes": {
       "PATH": [
@@ -34,7 +83,8 @@
       "@@@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\": \"HEAD\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src/third_party/angle\": \"HEAD\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
@@ -51,7 +101,7 @@
       "@@@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@  \"patch_root\": \"src/third_party/angle\", @@@",
       "@@@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}\", @@@",
@@ -107,7 +157,7 @@
       "--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",
+      "src/third_party/angle",
       "--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",
@@ -117,7 +167,10 @@
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
-      "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
+      "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
+      "--revision",
+      "src/third_party/angle@fac9503c46405f77757b9a728eb85b8d7bc6080c",
+      "--no-apply-patch-on-gclient"
     ],
     "env_prefixes": {
       "PATH": [
@@ -131,7 +184,8 @@
       "@@@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\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src/third_party/angle\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
@@ -148,7 +202,7 @@
       "@@@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@  \"patch_root\": \"src/third_party/angle\", @@@",
       "@@@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}\", @@@",

data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/{no_shallow.json → shallow.json}

@@ -18,7 +18,7 @@
       "/path/to/tmp/json",
       "--revision",
       "src@HEAD",
-      "--no_shallow",
+      "--maybe_shallow",
       "--disable-syntax-validation"
     ],
     "env_prefixes": {

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

@@ -14,12 +14,6 @@
       "[GIT_CACHE]",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
-      "--issue",
-      "12345",
-      "--patchset",
-      "654321",
-      "--rietveld_server",
-      "https://rietveld.example.com/",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -118,8 +112,6 @@
       "[GIT_CACHE]",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
-      "--rietveld_server",
-      "https://rietveld.example.com/",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",

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

@@ -14,12 +14,6 @@
       "[GIT_CACHE]",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
-      "--issue",
-      "12345",
-      "--patchset",
-      "654321",
-      "--rietveld_server",
-      "https://rietveld.example.com/",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -118,8 +112,6 @@
       "[GIT_CACHE]",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
-      "--rietveld_server",
-      "https://rietveld.example.com/",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",

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

@@ -14,12 +14,6 @@
       "[GIT_CACHE]",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
-      "--issue",
-      "12345",
-      "--patchset",
-      "654321",
-      "--rietveld_server",
-      "https://rietveld.example.com/",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",

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

@@ -14,12 +14,6 @@
       "[GIT_CACHE]",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
-      "--issue",
-      "12345",
-      "--patchset",
-      "654321",
-      "--rietveld_server",
-      "https://rietveld.example.com/",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -95,7 +89,6 @@
       "@@@STEP_LOG_LINE@json.output@  \"step_text\": \"Some step text\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@failure_type@\"PATCH_FAILURE\"@@@",
       "@@@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\"@@@",

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

@@ -14,12 +14,6 @@
       "[GIT_CACHE]",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
-      "--issue",
-      "12345",
-      "--patchset",
-      "654321",
-      "--rietveld_server",
-      "https://rietveld.example.com/",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",