libv8 6.2.414.42.1 → 6.3.292.48.0beta1

data/vendor/depot_tools/recipes/recipe_modules/depot_tools/examples/full.expected/win.json

@@ -55,6 +55,18 @@
     ],
     "name": "presubmit_support_py_path"
   },
+  {
+    "cmd": [
+      "echo",
+      "$PATH"
+    ],
+    "env_prefixes": {
+      "PATH": [
+        "RECIPE_PACKAGE_REPO[depot_tools]"
+      ]
+    },
+    "name": "on_path"
+  },
   {
     "name": "$result",
     "recipe_result": null,

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

@@ -4,9 +4,10 @@
 
 DEPS = [
   'depot_tools',
-  'recipe_engine/step',
   'recipe_engine/path',
   'recipe_engine/platform',
+  'recipe_engine/runtime',
+  'recipe_engine/step',
 ]
 
 
@@ -36,8 +37,16 @@ def RunSteps(api):
       'presubmit_support_py_path',
       ['ls', api.depot_tools.presubmit_support_py_path])
 
+  with api.depot_tools.on_path():
+    api.step('on_path', ['echo', '$PATH'])
+
 
 def GenTests(api):
   yield api.test('basic')
 
+  yield (
+    api.test('basic_luci')
+    + api.runtime(is_experimental=False, is_luci=True)
+  )
+
   yield api.test('win') + api.platform('win', 32)

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

@@ -63,12 +63,13 @@ class TryserverApi(recipe_api.RecipeApi):
 
     cwd = self.m.context.cwd or self.m.path['start_dir'].join(patch_root)
     with self.m.context(cwd=cwd):
-      step_result = self.m.git('diff', '--cached', '--name-only',
-                               name='git diff to analyze patch',
-                               stdout=self.m.raw_io.output(),
-                               step_test_data=lambda:
-                                 self.m.raw_io.test_api.stream_output('foo.cc'),
-                               **kwargs)
+      step_result = self.m.git(
+          '-c', 'core.quotePath=false', 'diff', '--cached', '--name-only',
+          name='git diff to analyze patch',
+          stdout=self.m.raw_io.output(),
+          step_test_data=lambda:
+            self.m.raw_io.test_api.stream_output('foo.cc'),
+          **kwargs)
     paths = [self.m.path.join(patch_root, p) for p in
              step_result.stdout.split()]
     if self.m.platform.is_win:
@@ -84,11 +85,12 @@ class TryserverApi(recipe_api.RecipeApi):
     cwd = self.m.path['checkout'].join(issue_root) if issue_root else None
 
     with self.m.context(cwd=cwd):
-      step_result = self.m.git('diff', '--cached', '--name-only',
-                               name='git diff to analyze patch',
-                               stdout=self.m.raw_io.output(),
-                               step_test_data=lambda:
-                                 self.m.raw_io.test_api.stream_output('foo.cc'))
+      step_result = self.m.git(
+          '-c', 'core.quotePath=false', 'diff', '--cached', '--name-only',
+          name='git diff to analyze patch',
+          stdout=self.m.raw_io.output(),
+          step_test_data=lambda:
+            self.m.raw_io.test_api.stream_output('foo.cc'))
     paths = step_result.stdout.split()
     if issue_root:
       paths = [self.m.path.join(issue_root, path) for path in paths]

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

@@ -2,6 +2,8 @@
   {
     "cmd": [
       "git",
+      "-c",
+      "core.quotePath=false",
       "diff",
       "--cached",
       "--name-only"

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

@@ -2,6 +2,8 @@
   {
     "cmd": [
       "git",
+      "-c",
+      "core.quotePath=false",
       "diff",
       "--cached",
       "--name-only"

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

@@ -29,6 +29,8 @@
   {
     "cmd": [
       "git",
+      "-c",
+      "core.quotePath=false",
       "diff",
       "--cached",
       "--name-only"

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

@@ -29,6 +29,8 @@
   {
     "cmd": [
       "git",
+      "-c",
+      "core.quotePath=false",
       "diff",
       "--cached",
       "--name-only"

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

@@ -2,6 +2,8 @@
   {
     "cmd": [
       "git",
+      "-c",
+      "core.quotePath=false",
       "diff",
       "--cached",
       "--name-only"

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

@@ -2,6 +2,8 @@
   {
     "cmd": [
       "git",
+      "-c",
+      "core.quotePath=false",
       "diff",
       "--cached",
       "--name-only"

data/vendor/depot_tools/recipes/trigger_recipe_roller.txt

@@ -0,0 +1 @@
+No-op file. Edit this to kick recipes.

data/vendor/depot_tools/roll_dep.py

@@ -68,58 +68,26 @@ def should_show_log(upstream_url):
   return True
 
 
-def roll(root, deps_dir, roll_to, key, reviewers, bug, no_log, log_limit,
-         ignore_dirty_tree=False):
-  deps = os.path.join(root, 'DEPS')
+def get_deps(root):
+  """Returns the path and the content of the DEPS file."""
+  deps_path = os.path.join(root, 'DEPS')
   try:
-    with open(deps, 'rb') as f:
+    with open(deps_path, 'rb') as f:
       deps_content = f.read()
   except (IOError, OSError):
     raise Error('Ensure the script is run in the directory '
                 'containing DEPS file.')
+  return deps_path, deps_content
 
-  if not ignore_dirty_tree and not is_pristine(root):
-    raise Error('Ensure %s is clean first (no non-merged commits).' % root)
-
-  full_dir = os.path.normpath(os.path.join(os.path.dirname(root), deps_dir))
-  if not os.path.isdir(full_dir):
-    raise Error('Directory not found: %s (%s)' % (deps_dir, full_dir))
-  head = check_output(['git', 'rev-parse', 'HEAD'], cwd=full_dir).strip()
-
-  if not head in deps_content:
-    print('Warning: %s is not checked out at the expected revision in DEPS' %
-          deps_dir)
-    if key is None:
-      print("Warning: no key specified.  Using '%s'." % deps_dir)
-      key = deps_dir
-
-    # It happens if the user checked out a branch in the dependency by himself.
-    # Fall back to reading the DEPS to figure out the original commit.
-    for i in deps_content.splitlines():
-      m = re.match(r'\s+"' + key + '":.*"([a-z0-9]{40})",', i)
-      if m:
-        head = m.group(1)
-        break
-    else:
-      raise Error('Expected to find commit %s for %s in DEPS' % (head, key))
-
-  print('Found old revision %s' % head)
-
-  check_call(['git', 'fetch', 'origin', '--quiet'], cwd=full_dir)
-  roll_to = check_output(['git', 'rev-parse', roll_to], cwd=full_dir).strip()
-  print('Found new revision %s' % roll_to)
-
-  if roll_to == head:
-    raise AlreadyRolledError('No revision to roll!')
 
+def generate_commit_message(
+    full_dir, dependency, head, roll_to, no_log, log_limit):
+  """Creates the commit message for this specific roll."""
   commit_range = '%s..%s' % (head[:9], roll_to[:9])
-
   upstream_url = check_output(
       ['git', 'config', 'remote.origin.url'], cwd=full_dir).strip()
   log_url = get_log_url(upstream_url, head, roll_to)
-  cmd = [
-    'git', 'log', commit_range, '--date=short', '--no-merges',
-  ]
+  cmd = ['git', 'log', commit_range, '--date=short', '--no-merges']
   logs = check_output(
       cmd + ['--format=%ad %ae %s'], # Args with '=' are automatically quoted.
       cwd=full_dir).rstrip()
@@ -130,16 +98,15 @@ def roll(root, deps_dir, roll_to, key, reviewers, bug, no_log, log_limit,
       if not l.endswith('recipe-roller Roll recipe dependencies (trivial).')
   ]
   logs = '\n'.join(cleaned_lines) + '\n'
+
   nb_commits = len(lines)
   rolls = nb_commits - len(cleaned_lines)
-
   header = 'Roll %s/ %s (%d commit%s%s)\n\n' % (
-      deps_dir,
+      dependency,
       commit_range,
       nb_commits,
       's' if nb_commits > 1 else '',
       ('; %s trivial rolls' % rolls) if rolls else '')
-
   log_section = ''
   if log_url:
     log_section = log_url + '\n\n'
@@ -152,34 +119,64 @@ def roll(root, deps_dir, roll_to, key, reviewers, bug, no_log, log_limit,
       # Keep the first N log entries.
       logs = ''.join(logs.splitlines(True)[:log_limit]) + '(...)\n'
     log_section += logs
-  log_section += '\n\nCreated with:\n  roll-dep ' + deps_dir
-  if key:
-    log_section += ' ' + key
-  log_section += '\n'
+  return header + log_section
+
 
-  reviewer = 'R=%s\n' % ','.join(reviewers) if reviewers else ''
-  bug = 'BUG=%s\n' % bug if bug else ''
-  msg = header + log_section + reviewer + bug
+def calculate_roll(full_dir, dependency, deps_content, roll_to, key):
+  """Calculates the roll for a dependency by processing deps_content, and
+  fetching the dependency via git.
+  """
+  head = check_output(['git', 'rev-parse', 'HEAD'], cwd=full_dir).strip()
+  if not head in deps_content:
+    print('Warning: %s is not checked out at the expected revision in DEPS' %
+          dependency)
+    if not key:
+      key = dependency
 
+    # It happens if the user checked out a branch in the dependency by himself.
+    # Fall back to reading the DEPS to figure out the original commit.
+    for i in deps_content.splitlines():
+      m = re.match(r'\s+"' + key + '":.*"([a-z0-9]{40})",', i)
+      if m:
+        head = m.group(1)
+        break
+    else:
+      raise Error('Expected to find commit %s for %s in DEPS' % (head, key))
+
+  check_call(['git', 'fetch', 'origin', '--quiet'], cwd=full_dir)
+  roll_to = check_output(['git', 'rev-parse', roll_to], cwd=full_dir).strip()
+  return head, roll_to
+
+
+def gen_commit_msg(logs, cmdline, rolls, reviewers, bug):
+  """Returns the final commit message."""
+  commit_msg = ''
+  if len(logs) > 1:
+    commit_msg = 'Rolling %d dependencies\n\n' % len(logs)
+  commit_msg += '\n\n'.join(logs)
+  commit_msg += '\nCreated with:\n  ' + cmdline
+  commit_msg += 'R=%s\n' % ','.join(reviewers) if reviewers else ''
+  commit_msg += 'BUG=%s\n' % bug if bug else ''
+  return commit_msg
+
+
+def finalize(commit_msg, deps_path, deps_content, rolls):
+  """Edits the DEPS file, commits it, then uploads a CL."""
   print('Commit message:')
-  print('\n'.join('    ' + i for i in msg.splitlines()))
-  deps_content = deps_content.replace(head, roll_to)
-  with open(deps, 'wb') as f:
+  print('\n'.join('    ' + i for i in commit_msg.splitlines()))
+
+  with open(deps_path, 'wb') as f:
     f.write(deps_content)
+  root = os.path.dirname(deps_path)
   check_call(['git', 'add', 'DEPS'], cwd=root)
-  check_call(['git', 'commit', '--quiet', '-m', msg], cwd=root)
+  check_call(['git', 'commit', '--quiet', '-m', commit_msg], cwd=root)
 
   # Pull the dependency to the right revision. This is surprising to users
   # otherwise.
-  check_call(['git', 'checkout', '--quiet', roll_to], cwd=full_dir)
-
-  print('')
-  if not reviewers:
-    print('You forgot to pass -r, make sure to insert a R=foo@example.com line')
-    print('to the commit description before emailing.')
-    print('')
-  print('Run:')
-  print('  git cl upload --send-mail')
+  for dependency, (_head, roll_to) in sorted(rolls.iteritems()):
+    full_dir = os.path.normpath(
+        os.path.join(os.path.dirname(root), dependency))
+    check_call(['git', 'checkout', '--quiet', roll_to], cwd=full_dir)
 
 
 def main():
@@ -203,11 +200,19 @@ def main():
   parser.add_argument(
       '--roll-to', default='origin/master',
       help='Specify the new commit to roll to (default: %(default)s)')
-  parser.add_argument('dep_path', help='Path to dependency')
-  parser.add_argument('key', nargs='?',
-      help='Regexp for dependency in DEPS file')
+  parser.add_argument(
+      '--key', action='append', default=[],
+      help='Regex(es) for dependency in DEPS file')
+  parser.add_argument('dep_path', nargs='+', help='Path(s) to dependency')
   args = parser.parse_args()
 
+  if len(args.dep_path) > 1:
+    if args.roll_to != 'origin/master':
+      parser.error(
+          'Can\'t use multiple paths to roll simultaneously and --roll-to')
+    if args.key:
+      parser.error(
+          'Can\'t use multiple paths to roll simultaneously and --key')
   reviewers = None
   if args.reviewer:
     reviewers = args.reviewer.split(',')
@@ -215,22 +220,55 @@ def main():
       if not '@' in r:
         reviewers[i] = r + '@chromium.org'
 
+  root = os.getcwd()
+  dependencies = sorted(d.rstrip('/').rstrip('\\') for d in args.dep_path)
+  cmdline = 'roll-dep ' + ' '.join(dependencies) + ''.join(
+      ' --key ' + k for k in args.key)
   try:
-    roll(
-        os.getcwd(),
-        args.dep_path.rstrip('/').rstrip('\\'),
-        args.roll_to,
-        args.key,
-        reviewers,
-        args.bug,
-        args.no_log,
-        args.log_limit,
-        args.ignore_dirty_tree)
-
+    if not args.ignore_dirty_tree and not is_pristine(root):
+      raise Error('Ensure %s is clean first (no non-merged commits).' % root)
+    # First gather all the information without modifying anything, except for a
+    # git fetch.
+    deps_path, deps_content = get_deps(root)
+    rolls = {}
+    for dependency in dependencies:
+      full_dir = os.path.normpath(
+          os.path.join(os.path.dirname(root), dependency))
+      if not os.path.isdir(full_dir):
+        raise Error('Directory not found: %s (%s)' % (dependency, full_dir))
+      head, roll_to = calculate_roll(
+          full_dir, dependency, deps_content, args.roll_to, args.key)
+      if roll_to == head:
+        if len(dependencies) == 1:
+          raise AlreadyRolledError('No revision to roll!')
+        print('%s: Already at latest commit %s' % (dependency, roll_to))
+      else:
+        print(
+            '%s: Rolling from %s to %s' % (dependency, head[:10], roll_to[:10]))
+        rolls[dependency] = (head, roll_to)
+
+    logs = []
+    for dependency, (head, roll_to) in sorted(rolls.iteritems()):
+      full_dir = os.path.normpath(
+          os.path.join(os.path.dirname(root), dependency))
+      log = generate_commit_message(
+          full_dir, dependency, head, roll_to, args.no_log, args.log_limit)
+      logs.append(log)
+      deps_content = deps_content.replace(head, roll_to)
+
+    commit_msg = gen_commit_msg(logs, cmdline, rolls, reviewers, args.bug)
+    finalize(commit_msg, deps_path, deps_content, rolls)
   except Error as e:
     sys.stderr.write('error: %s\n' % e)
     return 2 if isinstance(e, AlreadyRolledError) else 1
 
+  print('')
+  if not reviewers:
+    print('You forgot to pass -r, make sure to insert a R=foo@example.com line')
+    print('to the commit description before emailing.')
+    print('')
+  print('Run:')
+  print('  git cl upload --send-mail')
   return 0
 
 

data/vendor/depot_tools/scm.py

@@ -131,8 +131,8 @@ class GIT(object):
       upstream_branch = GIT.GetUpstreamBranch(cwd)
       if upstream_branch is None:
         raise gclient_utils.Error('Cannot determine upstream branch')
-    command = ['diff', '--name-status', '--no-renames',
-               '-r', '%s...' % upstream_branch]
+    command = ['-c', 'core.quotePath=false', 'diff',
+               '--name-status', '--no-renames', '-r', '%s...' % upstream_branch]
     if not files:
       pass
     elif isinstance(files, basestring):
@@ -277,7 +277,8 @@ class GIT(object):
     files, usually in the prospect to apply the patch for a try job."""
     if not branch:
       branch = GIT.GetUpstreamBranch(cwd)
-    command = ['diff', '-p', '--no-color', '--no-prefix', '--no-ext-diff',
+    command = ['-c', 'core.quotePath=false', 'diff',
+               '-p', '--no-color', '--no-prefix', '--no-ext-diff',
                branch + "..." + branch_head]
     if full_move:
       command.append('--no-renames')
@@ -300,7 +301,8 @@ class GIT(object):
     """Returns the list of modified files between two branches."""
     if not branch:
       branch = GIT.GetUpstreamBranch(cwd)
-    command = ['diff', '--name-only', branch + "..." + branch_head]
+    command = ['-c', 'core.quotePath=false', 'diff',
+               '--name-only', branch + "..." + branch_head]
     return GIT.Capture(command, cwd=cwd).splitlines(False)
 
   @staticmethod

data/vendor/depot_tools/split_cl.py

@@ -67,8 +67,7 @@ def AddUploadedByGitClSplitToDescription(description):
 
 
 def UploadCl(refactor_branch, refactor_branch_upstream, directory, files,
-             author, description, comment, owners_database, changelist,
-             cmd_upload):
+             description, comment, reviewers, changelist, cmd_upload):
   """Uploads a CL with all changes to |files| in |refactor_branch|.
 
   Args:
@@ -77,14 +76,12 @@ def UploadCl(refactor_branch, refactor_branch_upstream, directory, files,
     directory: Path to the directory that contains the OWNERS file for which
         to upload a CL.
     files: List of AffectedFile instances to include in the uploaded CL.
-    author: Email address of the user running this script.
     description: Description of the uploaded CL.
     comment: Comment to post on the uploaded CL.
-    owners_database: An owners.Database instance.
+    reviewers: A set of reviewers for the CL.
     changelist: The Changelist class.
     cmd_upload: The function associated with the git cl upload command.
   """
-
   # Create a branch.
   if not CreateBranchForDirectory(
       refactor_branch, directory, refactor_branch_upstream):
@@ -110,8 +107,6 @@ def UploadCl(refactor_branch, refactor_branch_upstream, directory, files,
     os.remove(tmp_file.name)
 
   # Upload a CL.
-  reviewers = owners_database.reviewers_for(
-      [f.LocalPath() for f in files], author)
   upload_args = ['-f', '--cq-dry-run', '-r', ','.join(reviewers)]
   if not comment:
     upload_args.append('--send-mail')
@@ -136,7 +131,32 @@ def GetFilesSplitByOwners(owners_database, files):
   return files_split_by_owners
 
 
-def SplitCl(description_file, comment_file, changelist, cmd_upload):
+def PrintClInfo(cl_index, num_cls, directory, file_paths, description,
+                reviewers):
+  """Prints info about a CL.
+
+  Args:
+    cl_index: The index of this CL in the list of CLs to upload.
+    num_cls: The total number of CLs that will be uploaded.
+    directory: Path to the directory that contains the OWNERS file for which
+        to upload a CL.
+    file_paths: A list of files in this CL.
+    description: The CL description.
+    reviewers: A set of reviewers for this CL.
+  """
+  description_lines = FormatDescriptionOrComment(description,
+                                                 directory).splitlines()
+  indented_description = '\n'.join(['    ' + l for l in description_lines])
+
+  print 'CL {}/{}'.format(cl_index, num_cls)
+  print 'Path: {}'.format(directory)
+  print 'Reviewers: {}'.format(', '.join(reviewers))
+  print '\n' + indented_description + '\n'
+  print '\n'.join(file_paths)
+  print
+
+
+def SplitCl(description_file, comment_file, changelist, cmd_upload, dry_run):
   """"Splits a branch into smaller branches and uploads CLs.
 
   Args:
@@ -144,6 +164,7 @@ def SplitCl(description_file, comment_file, changelist, cmd_upload):
     comment_file: File containing the comment of uploaded CLs.
     changelist: The Changelist class.
     cmd_upload: The function associated with the git cl upload command.
+    dry_run: Whether this is a dry run (no branches or CLs created).
 
   Returns:
     0 in case of success. 1 in case of error.
@@ -152,7 +173,7 @@ def SplitCl(description_file, comment_file, changelist, cmd_upload):
   comment = ReadFile(comment_file) if comment_file else None
 
   try:
-    EnsureInGitRepository();
+    EnsureInGitRepository()
 
     cl = changelist()
     change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
@@ -172,20 +193,26 @@ def SplitCl(description_file, comment_file, changelist, cmd_upload):
     owners_database = owners.Database(change.RepositoryRoot(), file, os.path)
     owners_database.load_data_needed_for([f.LocalPath() for f in files])
 
-    files_split_by_owners = GetFilesSplitByOwners(
-        owners_database, files)
+    files_split_by_owners = GetFilesSplitByOwners(owners_database, files)
 
-    print ('Will split current branch (' + refactor_branch +') in ' +
-           str(len(files_split_by_owners)) + ' CLs.\n')
+    num_cls = len(files_split_by_owners)
+    print('Will split current branch (' + refactor_branch + ') into ' +
+          str(num_cls) + ' CLs.\n')
 
-    for directory, files in files_split_by_owners.iteritems():
+    for cl_index, (directory, files) in \
+        enumerate(files_split_by_owners.iteritems(), 1):
       # Use '/' as a path separator in the branch name and the CL description
       # and comment.
       directory = directory.replace(os.path.sep, '/')
-      # Upload the CL.
-      UploadCl(refactor_branch, refactor_branch_upstream, directory, files,
-               author, description, comment, owners_database, changelist,
-               cmd_upload)
+      file_paths = [f.LocalPath() for f in files]
+      reviewers = owners_database.reviewers_for(file_paths, author)
+
+      if dry_run:
+        PrintClInfo(cl_index, num_cls, directory, file_paths, description,
+                    reviewers)
+      else:
+        UploadCl(refactor_branch, refactor_branch_upstream, directory, files,
+                 description, comment, reviewers, changelist, cmd_upload)
 
     # Go back to the original branch.
     git.run('checkout', refactor_branch)