libv8 5.6.326.50.0beta1 → 5.7.492.65.0beta1

data/vendor/depot_tools/owners.py

@@ -128,6 +128,11 @@ class Database(object):
     # Set of files which have already been read.
     self.read_files = set()
 
+    # Set of files which were included from other files. Files are processed
+    # differently depending on whether they are regular owners files or
+    # being included from another file.
+    self._included_files = {}
+
   def reviewers_for(self, files, author):
     """Returns a suggested set of reviewers that will cover the files.
 
@@ -251,48 +256,39 @@ class Database(object):
               'per-file globs cannot span directories or use escapes: "%s"' %
               line)
         relative_glob_string = self.os_path.relpath(full_glob_string, self.root)
-        self._add_entry(relative_glob_string, directive, 'per-file line',
-                        owners_path, lineno, '\n'.join(comment))
+        self._add_entry(relative_glob_string, directive, owners_path,
+                        lineno, '\n'.join(comment))
         continue
 
       if line.startswith('set '):
         raise SyntaxErrorInOwnersFile(owners_path, lineno,
             'unknown option: "%s"' % line[4:].strip())
 
-      self._add_entry(dirpath, line, 'line', owners_path, lineno,
+      self._add_entry(dirpath, line, owners_path, lineno,
                       ' '.join(comment))
 
-  def _add_entry(self, path, directive,
-                 line_type, owners_path, lineno, comment):
+  def _add_entry(self, owned_paths, directive, owners_path, lineno, comment):
     if directive == 'set noparent':
-      self._stop_looking.add(path)
+      self._stop_looking.add(owned_paths)
     elif directive.startswith('file:'):
-      owners_file = self._resolve_include(directive[5:], owners_path)
-      if not owners_file:
+      include_file = self._resolve_include(directive[5:], owners_path)
+      if not include_file:
         raise SyntaxErrorInOwnersFile(owners_path, lineno,
             ('%s does not refer to an existing file.' % directive[5:]))
 
-      self._read_owners(owners_file)
-
-      dirpath = self.os_path.dirname(owners_file)
-      for key in self._owners_to_paths:
-        if not dirpath in self._owners_to_paths[key]:
-          continue
-        self._owners_to_paths[key].add(path)
-
-      if dirpath in self._paths_to_owners:
-        self._paths_to_owners.setdefault(path, set()).update(
-            self._paths_to_owners[dirpath])
-
+      included_owners = self._read_just_the_owners(include_file)
+      for owner in included_owners:
+        self._owners_to_paths.setdefault(owner, set()).add(owned_paths)
+        self._paths_to_owners.setdefault(owned_paths, set()).add(owner)
     elif self.email_regexp.match(directive) or directive == EVERYONE:
       self.comments.setdefault(directive, {})
-      self.comments[directive][path] = comment
-      self._owners_to_paths.setdefault(directive, set()).add(path)
-      self._paths_to_owners.setdefault(path, set()).add(directive)
+      self.comments[directive][owned_paths] = comment
+      self._owners_to_paths.setdefault(directive, set()).add(owned_paths)
+      self._paths_to_owners.setdefault(owned_paths, set()).add(directive)
     else:
       raise SyntaxErrorInOwnersFile(owners_path, lineno,
-          ('%s is not a "set" directive, file include, "*", '
-           'or an email address: "%s"' % (line_type, directive)))
+          ('"%s" is not a "set noparent", file include, "*", '
+           'or an email address.' % (directive,)))
 
   def _resolve_include(self, path, start):
     if path.startswith('//'):
@@ -308,6 +304,35 @@ class Database(object):
 
     return include_path
 
+  def _read_just_the_owners(self, include_file):
+    if include_file in self._included_files:
+      return self._included_files[include_file]
+
+    owners = set()
+    self._included_files[include_file] = owners
+    lineno = 0
+    for line in self.fopen(self.os_path.join(self.root, include_file)):
+      lineno += 1
+      line = line.strip()
+      if (line.startswith('#') or line == '' or
+              line.startswith('set noparent') or
+              line.startswith('per-file')):
+        continue
+
+      if self.email_regexp.match(line) or line == EVERYONE:
+        owners.add(line)
+        continue
+      if line.startswith('file:'):
+        sub_include_file = self._resolve_include(line[5:], include_file)
+        sub_owners = self._read_just_the_owners(sub_include_file)
+        owners.update(sub_owners)
+        continue
+
+      raise SyntaxErrorInOwnersFile(include_file, lineno,
+          ('"%s" is not a "set noparent", file include, "*", '
+           'or an email address.' % (line,)))
+    return owners
+
   def _covering_set_of_owners_for(self, files, author):
     dirs_remaining = set(self._enclosing_dir_with_owners(f) for f in files)
     all_possible_owners = self.all_possible_owners(dirs_remaining, author)

data/vendor/depot_tools/presubmit_canned_checks.py

@@ -360,6 +360,8 @@ def CheckLongLines(input_api, output_api, maxlen, source_file_filter=None):
   # superset of CPP_EXCEPTIONS.
   CPP_FILE_EXTS = ('c', 'cc')
   CPP_EXCEPTIONS = ('#define', '#endif', '#if', '#include', '#pragma')
+  HTML_FILE_EXTS = ('html',)
+  HTML_EXCEPTIONS = ('<link',)
   JAVA_FILE_EXTS = ('java',)
   JAVA_EXCEPTIONS = ('import ', 'package ')
   JS_FILE_EXTS = ('js',)
@@ -372,6 +374,7 @@ def CheckLongLines(input_api, output_api, maxlen, source_file_filter=None):
 
   LANGUAGE_EXCEPTIONS = [
     (CPP_FILE_EXTS, CPP_EXCEPTIONS),
+    (HTML_FILE_EXTS, HTML_EXCEPTIONS),
     (JAVA_FILE_EXTS, JAVA_EXCEPTIONS),
     (JS_FILE_EXTS, JS_EXCEPTIONS),
     (OBJC_FILE_EXTS, OBJC_EXCEPTIONS),

data/vendor/depot_tools/presubmit_support.py

@@ -584,6 +584,10 @@ class _DiffCache(object):
     """Get the diff for a particular path."""
     raise NotImplementedError()
 
+  def GetOldContents(self, path, local_root):
+    """Get the old version for a particular path."""
+    raise NotImplementedError()
+
 
 class _GitDiffCache(_DiffCache):
   """DiffCache implementation for git; gets all file diffs at once."""
@@ -626,6 +630,9 @@ class _GitDiffCache(_DiffCache):
 
     return self._diffs_by_file[path]
 
+  def GetOldContents(self, path, local_root):
+    return scm.GIT.GetOldContents(local_root, path, branch=self._upstream)
+
 
 class AffectedFile(object):
   """Representation of a file in a change."""
@@ -670,6 +677,18 @@ class AffectedFile(object):
     """An alias to IsTestableFile for backwards compatibility."""
     return self.IsTestableFile()
 
+  def OldContents(self):
+    """Returns an iterator over the lines in the old version of file.
+
+    The old version is the file before any modifications in the user's
+    workspace, i.e. the "left hand side".
+
+    Contents will be empty if the file is a directory or does not exist.
+    Note: The carriage returns (LF or CR) are stripped off.
+    """
+    return self._diff_cache.GetOldContents(self.LocalPath(),
+                                           self._local_root).splitlines()
+
   def NewContents(self):
     """Returns an iterator over the lines in the new version of file.
 

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/api.py

@@ -33,16 +33,17 @@ class BotUpdateApi(recipe_api.RecipeApi):
     assert isinstance(cmd, (list, tuple))
     bot_update_path = self.resource('bot_update.py')
     kwargs.setdefault('infra_step', True)
-    kwargs.setdefault('env', {})
-    kwargs['env'].setdefault('PATH', '%(PATH)s')
-    kwargs['env']['PATH'] = self.m.path.pathsep.join([
-        kwargs['env']['PATH'], str(self._module.PACKAGE_REPO_ROOT)])
+    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"
-    kwargs['env']['GIT_HTTP_LOW_SPEED_LIMIT'] = 1000
-    kwargs['env']['GIT_HTTP_LOW_SPEED_TIME'] = 300
-    return self.m.python(name, bot_update_path, cmd, **kwargs)
+    env['GIT_HTTP_LOW_SPEED_LIMIT'] = 1000
+    env['GIT_HTTP_LOW_SPEED_TIME'] = 300
+    with self.m.step.context({'env': env}):
+      return self.m.python(name, bot_update_path, cmd, **kwargs)
 
   @property
   def last_returned_properties(self):
@@ -54,9 +55,10 @@ 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)
-    kwargs.setdefault('env', {}).setdefault('PATH', '%(PATH)s')
-    kwargs['env']['PATH'] = self.m.path.pathsep.join([
-        kwargs['env']['PATH'], str(self._module.PACKAGE_REPO_ROOT)])
+    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 '',
@@ -66,7 +68,8 @@ class BotUpdateApi(recipe_api.RecipeApi):
       cmd.append('--gerrit_no_reset')
     if gerrit_no_rebase_patch_ref:
       cmd.append('--gerrit_no_rebase_patch_ref')
-    return self.m.python('apply_gerrit', apply_gerrit_path, cmd, **kwargs)
+    with self.m.step.context({'env': env}):
+      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,

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

@@ -16,6 +16,7 @@
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "apply_gerrit"
   },
   {

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/basic.json

@@ -22,6 +22,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update (without patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/basic_output_manifest.json

@@ -23,6 +23,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/basic_with_branch_heads.json

@@ -23,6 +23,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update - with branch heads",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/buildbot.json

@@ -22,6 +22,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update (without patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/clobber.json

@@ -23,6 +23,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/gerrit_no_rebase_patch_ref.json

@@ -23,6 +23,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/gerrit_no_reset.json

@@ -23,6 +23,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/no_shallow.json

@@ -23,6 +23,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/reset_root_solution_revision.json

@@ -22,6 +22,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/trychange.json

@@ -24,6 +24,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/trychange_oauth2_buildbot.json

@@ -26,6 +26,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/trychange_oauth2_json.json

@@ -24,6 +24,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/trychange_oauth2_json_win.json

@@ -24,6 +24,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/tryjob.json

@@ -28,6 +28,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/tryjob_fail.json

@@ -28,6 +28,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/tryjob_fail_patch.json

@@ -28,6 +28,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/tryjob_fail_patch_download.json

@@ -28,6 +28,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",
@@ -65,6 +66,7 @@
       "-u",
       "import sys;print \"Patch download failed. See bot_update step for details\";sys.exit(1)"
     ],
+    "infra_step": true,
     "name": "Patch failure - Try Rebasing",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/tryjob_gerrit_angle.json

@@ -28,6 +28,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/tryjob_gerrit_angle_deprecated.json

@@ -28,6 +28,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/tryjob_v8.json

@@ -30,6 +30,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/example.expected/tryjob_v8_head_by_default.json

@@ -30,6 +30,7 @@
       "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
+    "infra_step": true,
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",

data/vendor/depot_tools/{recipe_modules → recipes/recipe_modules}/bot_update/resources/bot_update.py

@@ -38,7 +38,7 @@ BUILDER_DIR = path.dirname(CURRENT_DIR)
 # Relative to this script's filesystem path.
 THIS_DIR = path.dirname(path.abspath(__file__))
 
-DEPOT_TOOLS_DIR = path.abspath(path.join(THIS_DIR, '..', '..', '..'))
+DEPOT_TOOLS_DIR = path.abspath(path.join(THIS_DIR, '..', '..', '..', '..'))
 
 CHROMIUM_GIT_HOST = 'https://chromium.googlesource.com'
 CHROMIUM_SRC_URL = CHROMIUM_GIT_HOST + '/chromium/src.git'
@@ -679,7 +679,7 @@ 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)
+          git('rebase', base_rev, cwd=root, tries=1)
         except SubprocessFailed:
           # Abort the rebase since there were failures.
           git('rebase', '--abort', cwd=root)