depot_tools: adjust for resource API changes in recipe engine

recipe_modules/git/api.py

 # 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.
 
 import itertools
 import re
 
 from recipe_engine import recipe_api
 
 class GitApi(recipe_api.RecipeApi):
   _GIT_HASH_RE = re.compile('[0-9a-f]{40}', re.IGNORECASE)
 
   def __init__(self, *args, **kwargs):
     super(GitApi, self).__init__(*args, **kwargs)
     self.initialized_win_git = False
 
   def __call__(self, *args, **kwargs):
     """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()
-      git_cmd = [self.package_resource('git.bat')]
+      git_cmd = [self.package_repo_resource('git.bat')]
     options = kwargs.pop('git_config_options', {})
     for k, v in sorted(options.iteritems()):
       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)
     except self.m.step.StepFailure as f:
       if can_fail_build:
         raise
       else:
         return f.result
 
   def ensure_win_git_tooling(self):
     """Ensures that depot_tools/git.bat actually exists."""
     if not self.m.platform.is_win or self.initialized_win_git:
       return
     self.m.step(
         'ensure git tooling on windows',
-        [self.package_resource('bootstrap', 'win', 'win_tools.bat')],
+        [self.package_repo_resource('bootstrap', 'win', 'win_tools.bat')],
         infra_step=True,
-        cwd=self.package_resource())
+        cwd=self.package_repo_resource())
     self.initialized_win_git = True
 
   def fetch_tags(self, remote_name=None, **kwargs):
     """Fetches all tags from the remote."""
     kwargs.setdefault('name', 'git fetch tags')
     remote_name = remote_name or 'origin'
     return self('fetch', remote_name, '--tags', **kwargs)
 
   def cat_file_at_commit(self, file_path, commit_hash, remote_name=None,
                          **kwargs):
@@ skipping 123 matching lines @@
 
     git_setup_args = ['--path', dir_path, '--url', url]
 
     if remote_name:
       git_setup_args += ['--remote', remote_name]
     else:
       remote_name = 'origin'
 
     if self.m.platform.is_win:
       self.ensure_win_git_tooling()
-      git_setup_args += ['--git_cmd_path', self.package_resource('git.bat')]
+      git_setup_args += [
+          '--git_cmd_path', self.package_repo_resource('git.bat')]
 
     step_suffix = '' if step_suffix is  None else ' (%s)' % step_suffix
     self.m.python(
         'git setup%s' % step_suffix,
         self.resource('git_setup.py'),
         git_setup_args)
 
     # 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.
@@ skipping 164 matching lines @@
 
     Args:
       bundle_path (Path): The path of the output bundle.
       refs (list): The list of refs to include in the bundle. If None, all
           refs in the Git checkout will be bundled.
       kwargs: Forwarded to '__call__'.
     """
     if not rev_list_args:
       rev_list_args = ['--all']
     self('bundle', 'create', bundle_path, *rev_list_args, **kwargs)