libv8 5.3.332.38.5 → 5.6.326.50.0beta1

data/vendor/depot_tools/recipe_modules/gclient/example.expected/tryserver.json

@@ -87,13 +87,13 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "config",
       "--spec",
-      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'WebKit', 'safesync_url': 'https://blink-status.appspot.com/lkgr', 'url': 'svn://svn.chromium.org/blink/trunk'}]"
+      "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'Angle', 'url': 'https://chromium.googlesource.com/angle/angle.git'}]"
     ],
-    "cwd": "[SLAVE_BUILD]/src/third_party",
+    "cwd": "[START_DIR]/src/third_party",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
-    "name": "[spec: WebKit] gclient setup"
+    "name": "[spec: Angle] gclient setup"
   },
   {
     "cmd": [
@@ -111,20 +111,22 @@
       "--no-nag-max",
       "--delete_unversioned_trees",
       "--revision",
-      "third_party/WebKit@123",
+      "Angle@HEAD",
+      "--revision",
+      "src/third_party/angle@refs/heads/lkgr",
       "--output-json",
       "/path/to/tmp/json"
     ],
-    "cwd": "[SLAVE_BUILD]/src/third_party",
+    "cwd": "[START_DIR]/src/third_party",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
-    "name": "[spec: WebKit] gclient sync",
+    "name": "[spec: Angle] gclient sync",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"solutions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"WebKit/\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"3eebce6ea96f9e6c03e9252a4f8ef2ea9fe141c2\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"Angle/\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"1fd70473fb3de634b409d4acaf49ffc1f90aae1f\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"src/blatley/\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"revision\": \"5e800497199d615131a76cd10651e74d7c8a0962\"@@@",
@@ -146,11 +148,11 @@
       "user.name",
       "local_bot"
     ],
-    "cwd": "[SLAVE_BUILD]/src/third_party",
+    "cwd": "[START_DIR]/src/third_party",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
-    "name": "[spec: WebKit] gclient recurse (git config user.name)"
+    "name": "[spec: Angle] gclient recurse (git config user.name)"
   },
   {
     "cmd": [
@@ -163,18 +165,18 @@
       "user.email",
       "local_bot@example.com"
     ],
-    "cwd": "[SLAVE_BUILD]/src/third_party",
+    "cwd": "[START_DIR]/src/third_party",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
-    "name": "[spec: WebKit] gclient recurse (git config user.email)"
+    "name": "[spec: Angle] gclient recurse (git config user.email)"
   },
   {
     "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",
-      "[SLAVE_BUILD]"
+      "[START_DIR]"
     ],
     "name": "cleanup index.lock",
     "~followup_annotations": [
@@ -199,7 +201,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[SLAVE_BUILD]/src",
+    "cwd": "[START_DIR]/src",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },

data/vendor/depot_tools/recipe_modules/gclient/example.py

@@ -6,6 +6,7 @@ DEPS = [
   'gclient',
   'recipe_engine/path',
   'recipe_engine/properties',
+  'recipe_engine/step',
 ]
 
 
@@ -42,6 +43,7 @@ TEST_CONFIGS = [
   'master_deps',
   'mojo',
   'nacl',
+  'ndk_next',
   'pdfium',
   'perf',
   'recipes_py',
@@ -70,21 +72,19 @@ def RunSteps(api):
   api.gclient.c = src_cfg
   api.gclient.checkout()
 
-  api.gclient.spec_alias = 'WebKit'
+  api.gclient.spec_alias = 'Angle'
   bl_cfg = api.gclient.make_config()
   soln = bl_cfg.solutions.add()
-  soln.name = 'WebKit'
-  soln.url = 'svn://svn.chromium.org/blink/trunk'
-  bl_cfg.revisions['third_party/WebKit'] = '123'
-
-  # Use safesync url for lkgr.
-  soln.safesync_url = 'https://blink-status.appspot.com/lkgr'
+  soln.name = 'Angle'
+  soln.url = 'https://chromium.googlesource.com/angle/angle.git'
+  bl_cfg.revisions['src/third_party/angle'] = 'refs/heads/lkgr'
 
   bl_cfg.got_revision_mapping['src/blatley'] = 'got_blatley_revision'
-  api.gclient.checkout(
-      gclient_config=bl_cfg,
-      with_branch_heads=True,
-      cwd=api.path['slave_build'].join('src', 'third_party'))
+  with api.step.context({
+      'cwd': api.path['start_dir'].join('src', 'third_party')}):
+    api.gclient.checkout(
+        gclient_config=bl_cfg,
+        with_branch_heads=True)
 
   api.gclient.break_locks()
 
@@ -98,6 +98,8 @@ def RunSteps(api):
 def GenTests(api):
   yield api.test('basic')
 
+  yield api.test('buildbot') + api.properties(path_config='buildbot')
+
   yield api.test('revision') + api.properties(revision='abc')
 
   yield api.test('tryserver') + api.properties.tryserver()

data/vendor/depot_tools/recipe_modules/gerrit/__init__.py

@@ -0,0 +1,6 @@
+DEPS = [
+  'recipe_engine/json',
+  'recipe_engine/path',
+  'recipe_engine/python',
+  'recipe_engine/raw_io',
+]

data/vendor/depot_tools/recipe_modules/gerrit/api.py

@@ -0,0 +1,63 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+from recipe_engine import recipe_api
+
+class GerritApi(recipe_api.RecipeApi):
+  """Module for interact with gerrit endpoints"""
+
+  def __call__(self, name, cmd, infra_step=True, **kwargs):
+    """Wrapper for easy calling of gerrit_utils steps."""
+    assert isinstance(cmd, (list, tuple))
+    prefix = 'gerrit '
+
+    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)])
+
+    return self.m.python(prefix + name,
+                         self.package_repo_resource('gerrit_client.py'),
+                         cmd,
+                         infra_step=infra_step,
+                         **kwargs)
+
+  def create_gerrit_branch(self, host, project, branch, commit, **kwargs):
+    """
+    Create a new branch from given project and commit
+
+    Returns:
+      the ref of the branch created
+    """
+    args = [
+        'branch',
+        '--host', host,
+        '--project', project,
+        '--branch', branch,
+        '--commit', commit,
+        '--json_file', self.m.json.output()
+    ]
+    step_name = 'create_gerrit_branch'
+    step_result = self(step_name, args, **kwargs)
+    ref = step_result.json.output.get('ref')
+    return ref
+
+  def get_gerrit_branch(self, host, project, branch, **kwargs):
+    """
+    Get a branch from given project and commit
+
+    Returns:
+      the revision of the branch
+    """
+    args = [
+        'branchinfo',
+        '--host', host,
+        '--project', project,
+        '--branch', branch,
+        '--json_file', self.m.json.output()
+    ]
+    step_name='get_gerrit_branch'
+    step_result = self(step_name, args, **kwargs)
+    revision = step_result.json.output.get('revision')
+    return revision

data/vendor/depot_tools/recipe_modules/gerrit/example.expected/basic.json

@@ -0,0 +1,64 @@
+[
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
+      "branch",
+      "--host",
+      "https://chromium-review.googlesource.com/a",
+      "--project",
+      "v8/v8",
+      "--branch",
+      "test",
+      "--commit",
+      "67ebf73496383c6777035e374d2d664009e2aa5c",
+      "--json_file",
+      "/path/to/tmp/json"
+    ],
+    "env": {
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "gerrit create_gerrit_branch",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"can_delete\": true, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"ref\": \"refs/heads/test\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"revision\": \"76016386a0d8ecc7b6be212424978bb45959d668\"@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
+      "branchinfo",
+      "--host",
+      "https://chromium-review.googlesource.com/a",
+      "--project",
+      "v8/v8",
+      "--branch",
+      "master",
+      "--json_file",
+      "/path/to/tmp/json"
+    ],
+    "env": {
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "gerrit get_gerrit_branch",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"ref\": \"refs/heads/master\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"revision\": \"67ebf73496383c6777035e374d2d664009e2aa5c\"@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "name": "$result",
+    "recipe_result": null,
+    "status_code": 0
+  }
+]

data/vendor/depot_tools/recipe_modules/gerrit/example.py

@@ -0,0 +1,35 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+DEPS = [
+    'gerrit'
+]
+
+
+def RunSteps(api):
+  host = 'https://chromium-review.googlesource.com/a'
+  project = 'v8/v8'
+
+  branch = 'test'
+  commit = '67ebf73496383c6777035e374d2d664009e2aa5c'
+
+  data = api.gerrit.create_gerrit_branch(host, project, branch, commit)
+  assert data == 'refs/heads/test'
+
+  data = api.gerrit.get_gerrit_branch(host, project, 'master')
+  assert data == '67ebf73496383c6777035e374d2d664009e2aa5c'
+
+
+def GenTests(api):
+  yield (
+      api.test('basic')
+      + api.step_data(
+          'gerrit create_gerrit_branch',
+          api.gerrit.make_gerrit_create_branch_response_data()
+      )
+      + api.step_data(
+          'gerrit get_gerrit_branch',
+          api.gerrit.make_gerrit_get_branch_response_data()
+      )
+  )

data/vendor/depot_tools/recipe_modules/gerrit/test_api.py

@@ -0,0 +1,24 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+from recipe_engine import recipe_test_api
+
+
+class GerritTestApi(recipe_test_api.RecipeTestApi):
+
+  def _make_gerrit_response_json(self, data):
+    return self.m.json.output(data)
+
+  def make_gerrit_create_branch_response_data(self):
+    return self._make_gerrit_response_json({
+      "ref": "refs/heads/test",
+      "revision": "76016386a0d8ecc7b6be212424978bb45959d668",
+      "can_delete": True
+    })
+
+  def make_gerrit_get_branch_response_data(self):
+    return self._make_gerrit_response_json({
+      "ref": "refs/heads/master",
+      "revision": "67ebf73496383c6777035e374d2d664009e2aa5c"
+    })

data/vendor/depot_tools/recipe_modules/git/__init__.py

@@ -7,3 +7,7 @@ DEPS = [
   'recipe_engine/raw_io',
   'recipe_engine/step',
 ]
+
+
+# TODO(phajdan.jr): provide coverage (http://crbug.com/693058).
+DISABLE_STRICT_COVERAGE = True

data/vendor/depot_tools/recipe_modules/git/api.py

@@ -18,8 +18,6 @@ class GitApi(recipe_api.RecipeApi):
     """Return a git command step."""
     name = kwargs.pop('name', 'git ' + args[0])
     infra_step = kwargs.pop('infra_step', True)
-    if 'cwd' not in kwargs:
-      kwargs.setdefault('cwd', self.m.path['checkout'])
     git_cmd = ['git']
     if self.m.platform.is_win:
       self.ensure_win_git_tooling()
@@ -29,8 +27,12 @@ class GitApi(recipe_api.RecipeApi):
       git_cmd.extend(['-c', '%s=%s' % (k, v)])
     can_fail_build = kwargs.pop('can_fail_build', True)
     try:
-      return self.m.step(name, git_cmd + list(args), infra_step=infra_step,
-                         **kwargs)
+      context = {}
+      if not self.m.step.get_from_context('cwd') and self.m.path['checkout']:
+        context['cwd'] = self.m.path['checkout']
+      with self.m.step.context(context):
+        return self.m.step(name, git_cmd + list(args), infra_step=infra_step,
+                           **kwargs)
     except self.m.step.StepFailure as f:
       if can_fail_build:
         raise
@@ -41,13 +43,13 @@ class GitApi(recipe_api.RecipeApi):
     """Ensures that depot_tools/git.bat actually exists."""
     if not self.m.platform.is_win or self.initialized_win_git:
       return
-    self.m.python(
-        'ensure git tooling on windows',
-        self.package_repo_resource('bootstrap', 'win', 'git_bootstrap.py'),
-        ['--verbose'],
-        infra_step=True,
-        cwd=self.package_repo_resource(),
-        timeout=300)
+    with self.m.step.context({'cwd': self.package_repo_resource()}):
+      self.m.python(
+          'ensure git tooling on windows',
+          self.package_repo_resource('bootstrap', 'win', 'git_bootstrap.py'),
+          ['--verbose'],
+          infra_step=True,
+          timeout=300)
     self.initialized_win_git = True
 
   def fetch_tags(self, remote_name=None, **kwargs):
@@ -186,7 +188,7 @@ class GitApi(recipe_api.RecipeApi):
       # ex: ssh://host:repo/foobar/.git
       dir_path = dir_path or dir_path.rsplit('/', 1)[-1]
 
-      dir_path = self.m.path['slave_build'].join(dir_path)
+      dir_path = self.m.path['start_dir'].join(dir_path)
 
     if 'checkout' not in self.m.path:
       self.m.path['checkout'] = dir_path
@@ -213,133 +215,124 @@ class GitApi(recipe_api.RecipeApi):
     path = self.m.path.pathsep.join([
         str(self.package_repo_resource()), '%(PATH)s'])
 
-    if use_git_cache:
-      with self.m.step.context({'env': {'PATH': path}}):
-        self('retry', 'cache', 'populate', '-c', self.m.path['git_cache'], url,
-             name='populate cache',
-             can_fail_build=can_fail_build,
-             cwd=dir_path)
-        dir_cmd = self(
-            'cache', 'exists', '--quiet',
-            '--cache-dir', self.m.path['git_cache'], url,
-            can_fail_build=can_fail_build,
-            stdout=self.m.raw_io.output(),
-            step_test_data=lambda:
-                self.m.raw_io.test_api.stream_output('mirror_dir'),
-            cwd=dir_path)
-        mirror_dir = dir_cmd.stdout.strip()
-        self('remote', 'set-url', 'origin', mirror_dir,
-             can_fail_build=can_fail_build,
-             cwd=dir_path)
-
-    # There are five kinds of refs we can be handed:
-    # 0) None. In this case, we default to properties['branch'].
-    # 1) A 40-character SHA1 hash.
-    # 2) A fully-qualifed arbitrary ref, e.g. 'refs/foo/bar/baz'.
-    # 3) A fully qualified branch name, e.g. 'refs/heads/master'.
-    #    Chop off 'refs/heads' and now it matches case (4).
-    # 4) A branch name, e.g. 'master'.
-    # Note that 'FETCH_HEAD' can be many things (and therefore not a valid
-    # checkout target) if many refs are fetched, but we only explicitly fetch
-    # one ref here, so this is safe.
-    fetch_args = []
-    if not ref:                                  # Case 0
-      fetch_remote = remote_name
-      fetch_ref = self.m.properties.get('branch') or 'master'
-      checkout_ref = 'FETCH_HEAD'
-    elif self._GIT_HASH_RE.match(ref):        # Case 1.
-      fetch_remote = remote_name
-      fetch_ref = ''
-      checkout_ref = ref
-    elif ref.startswith('refs/heads/'):       # Case 3.
-      fetch_remote = remote_name
-      fetch_ref = ref[len('refs/heads/'):]
-      checkout_ref = 'FETCH_HEAD'
-    else:                                     # Cases 2 and 4.
-      fetch_remote = remote_name
-      fetch_ref = ref
-      checkout_ref = 'FETCH_HEAD'
-
-    fetch_args = [x for x in (fetch_remote, fetch_ref) if x]
-    if recursive:
-      fetch_args.append('--recurse-submodules')
-
-    fetch_env = {'PATH': path}
-    fetch_stderr = None
-    if curl_trace_file:
-      fetch_env['GIT_CURL_VERBOSE'] = '1'
-      fetch_stderr = self.m.raw_io.output(leak_to=curl_trace_file)
-
-    fetch_step_name = 'git fetch%s' % step_suffix
-    if display_fetch_size:
-      count_objects_before_fetch = self.count_objects(
-          name='count-objects before %s' % fetch_step_name,
-          cwd=dir_path,
-          step_test_data=lambda: self.m.raw_io.test_api.stream_output(
-              self.test_api.count_objects_output(1000)))
-    self('retry', 'fetch', *fetch_args,
-      cwd=dir_path,
-      name=fetch_step_name,
-      env=fetch_env,
-      stderr=fetch_stderr,
-      can_fail_build=can_fail_build)
-    if display_fetch_size:
-      self.count_objects(
-          name='count-objects after %s' % fetch_step_name,
-          cwd=dir_path,
-          previous_result=count_objects_before_fetch,
-          step_test_data=lambda: self.m.raw_io.test_api.stream_output(
-              self.test_api.count_objects_output(2000)))
-
-    if file_name:
-      self('checkout', '-f', checkout_ref, '--', file_name,
-        cwd=dir_path,
-        name='git checkout%s' % step_suffix,
+    with self.m.step.context({'cwd': dir_path}):
+      if use_git_cache:
+        with self.m.step.context({'env': {'PATH': path}}):
+          self('retry', 'cache', 'populate', '-c',
+               self.m.infra_paths.default_git_cache_dir, url,
+
+               name='populate cache',
+               can_fail_build=can_fail_build)
+          dir_cmd = self(
+              'cache', 'exists', '--quiet',
+              '--cache-dir', self.m.infra_paths.default_git_cache_dir, url,
+              can_fail_build=can_fail_build,
+              stdout=self.m.raw_io.output(),
+              step_test_data=lambda:
+                  self.m.raw_io.test_api.stream_output('mirror_dir'))
+          mirror_dir = dir_cmd.stdout.strip()
+          self('remote', 'set-url', 'origin', mirror_dir,
+               can_fail_build=can_fail_build)
+
+      # There are five kinds of refs we can be handed:
+      # 0) None. In this case, we default to properties['branch'].
+      # 1) A 40-character SHA1 hash.
+      # 2) A fully-qualifed arbitrary ref, e.g. 'refs/foo/bar/baz'.
+      # 3) A fully qualified branch name, e.g. 'refs/heads/master'.
+      #    Chop off 'refs/heads' and now it matches case (4).
+      # 4) A branch name, e.g. 'master'.
+      # Note that 'FETCH_HEAD' can be many things (and therefore not a valid
+      # checkout target) if many refs are fetched, but we only explicitly fetch
+      # one ref here, so this is safe.
+      fetch_args = []
+      if not ref:                                  # Case 0
+        fetch_remote = remote_name
+        fetch_ref = self.m.properties.get('branch') or 'master'
+        checkout_ref = 'FETCH_HEAD'
+      elif self._GIT_HASH_RE.match(ref):        # Case 1.
+        fetch_remote = remote_name
+        fetch_ref = ''
+        checkout_ref = ref
+      elif ref.startswith('refs/heads/'):       # Case 3.
+        fetch_remote = remote_name
+        fetch_ref = ref[len('refs/heads/'):]
+        checkout_ref = 'FETCH_HEAD'
+      else:                                     # Cases 2 and 4.
+        fetch_remote = remote_name
+        fetch_ref = ref
+        checkout_ref = 'FETCH_HEAD'
+
+      fetch_args = [x for x in (fetch_remote, fetch_ref) if x]
+      if recursive:
+        fetch_args.append('--recurse-submodules')
+
+      fetch_env = {'PATH': path}
+      fetch_stderr = None
+      if curl_trace_file:
+        fetch_env['GIT_CURL_VERBOSE'] = '1'
+        fetch_stderr = self.m.raw_io.output(leak_to=curl_trace_file)
+
+      fetch_step_name = 'git fetch%s' % step_suffix
+      if display_fetch_size:
+        count_objects_before_fetch = self.count_objects(
+            name='count-objects before %s' % fetch_step_name,
+            step_test_data=lambda: self.m.raw_io.test_api.stream_output(
+                self.test_api.count_objects_output(1000)))
+      self('retry', 'fetch', *fetch_args,
+        name=fetch_step_name,
+        env=fetch_env,
+        stderr=fetch_stderr,
         can_fail_build=can_fail_build)
+      if display_fetch_size:
+        self.count_objects(
+            name='count-objects after %s' % fetch_step_name,
+            previous_result=count_objects_before_fetch,
+            step_test_data=lambda: self.m.raw_io.test_api.stream_output(
+                self.test_api.count_objects_output(2000)))
+
+      if file_name:
+        self('checkout', '-f', checkout_ref, '--', file_name,
+          name='git checkout%s' % step_suffix,
+          can_fail_build=can_fail_build)
 
-    else:
-      self('checkout', '-f', checkout_ref,
-        cwd=dir_path,
-        name='git checkout%s' % step_suffix,
+      else:
+        self('checkout', '-f', checkout_ref,
+          name='git checkout%s' % step_suffix,
+          can_fail_build=can_fail_build)
+
+      rev_parse_step = self('rev-parse', 'HEAD',
+                           name='read revision',
+                           stdout=self.m.raw_io.output(),
+                           can_fail_build=False,
+                           step_test_data=lambda:
+                              self.m.raw_io.test_api.stream_output('deadbeef'))
+
+      if rev_parse_step.presentation.status == 'SUCCESS':
+        sha = rev_parse_step.stdout.strip()
+        retVal = sha
+        rev_parse_step.presentation.step_text = "<br/>checked out %r<br/>" % sha
+        if set_got_revision:
+          rev_parse_step.presentation.properties['got_revision'] = sha
+
+      clean_args = list(itertools.chain(
+          *[('-e', path) for path in keep_paths or []]))
+
+      self('clean', '-f', '-d', '-x', *clean_args,
+        name='git clean%s' % step_suffix,
         can_fail_build=can_fail_build)
 
-    rev_parse_step = self('rev-parse', 'HEAD',
-                         cwd=dir_path,
-                         name='read revision',
-                         stdout=self.m.raw_io.output(),
-                         can_fail_build=False,
-                         step_test_data=lambda:
-                            self.m.raw_io.test_api.stream_output('deadbeef'))
-
-    if rev_parse_step.presentation.status == 'SUCCESS':
-      sha = rev_parse_step.stdout.strip()
-      retVal = sha
-      rev_parse_step.presentation.step_text = "<br/>checked out %r<br/>" % sha
-      if set_got_revision:
-        rev_parse_step.presentation.properties['got_revision'] = sha
-
-    clean_args = list(itertools.chain(
-        *[('-e', path) for path in keep_paths or []]))
-
-    self('clean', '-f', '-d', '-x', *clean_args,
-      name='git clean%s' % step_suffix,
-      cwd=dir_path,
-      can_fail_build=can_fail_build)
-
-    if submodules:
-      self('submodule', 'sync',
-        name='submodule sync%s' % step_suffix,
-        cwd=dir_path,
-        can_fail_build=can_fail_build)
-      submodule_update = ['submodule', 'update', '--init']
-      if submodule_update_recursive:
-        submodule_update.append('--recursive')
-      if submodule_update_force:
-        submodule_update.append('--force')
-      self(*submodule_update,
-        name='submodule update%s' % step_suffix,
-        cwd=dir_path,
-        can_fail_build=can_fail_build)
+      if submodules:
+        self('submodule', 'sync',
+          name='submodule sync%s' % step_suffix,
+          can_fail_build=can_fail_build)
+        submodule_update = ['submodule', 'update', '--init']
+        if submodule_update_recursive:
+          submodule_update.append('--recursive')
+        if submodule_update_force:
+          submodule_update.append('--force')
+        self(*submodule_update,
+          name='submodule update%s' % step_suffix,
+          can_fail_build=can_fail_build)
 
     return retVal
 
@@ -362,13 +355,14 @@ class GitApi(recipe_api.RecipeApi):
     remote_name (str): the remote name to rebase from if not origin
     """
     remote_name = remote_name or 'origin'
-    try:
-      self('rebase', '%s/master' % remote_name,
-          name="%s rebase" % name_prefix, cwd=dir_path, **kwargs)
-    except self.m.step.StepFailure:
-      self('rebase', '--abort', name='%s rebase abort' % name_prefix,
-          cwd=dir_path, **kwargs)
-      raise
+    with self.m.step.context({'cwd': dir_path}):
+      try:
+        self('rebase', '%s/master' % remote_name,
+             name="%s rebase" % name_prefix, **kwargs)
+      except self.m.step.StepFailure:
+        self('rebase', '--abort', name='%s rebase abort' % name_prefix,
+             **kwargs)
+        raise
 
   def config_get(self, prop_name, **kwargs):
     """Returns: (str) The Git config output, or None if no output was generated.
@@ -409,3 +403,22 @@ class GitApi(recipe_api.RecipeApi):
     if not rev_list_args:
       rev_list_args = ['--all']
     self('bundle', 'create', bundle_path, *rev_list_args, **kwargs)
+
+  def new_branch(self, branch, name=None, upstream=None, **kwargs):
+    """Runs git new-branch on a Git repository, to be used before git cl upload.
+
+    Args:
+      branch (str): new branch name, which must not yet exist.
+      name (str): step name.
+      upstream (str): to origin/master.
+      kwargs: Forwarded to '__call__'.
+    """
+    env = kwargs.pop('env', {})
+    env['PATH'] = self.m.path.pathsep.join([
+        str(self.package_repo_resource()), '%(PATH)s'])
+    args = ['new-branch', branch]
+    if upstream:
+      args.extend(['--upstream', upstream])
+    if not name:
+      name = 'git new-branch %s' % branch
+    return self(*args, name=name, env=env, **kwargs)