Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(413)

Side by Side Diff: recipe_modules/git/api.py

Issue 1750733002: Revert of Fix git recipe module to use git.bad as package resouce. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | recipe_modules/git/example.expected/platform_win.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import itertools 5 import itertools
6 import re 6 import re
7 7
8 from recipe_engine import recipe_api 8 from recipe_engine import recipe_api
9 9
10 class GitApi(recipe_api.RecipeApi): 10 class GitApi(recipe_api.RecipeApi):
11 _GIT_HASH_RE = re.compile('[0-9a-f]{40}', re.IGNORECASE) 11 _GIT_HASH_RE = re.compile('[0-9a-f]{40}', re.IGNORECASE)
12 12
13 def __call__(self, *args, **kwargs): 13 def __call__(self, *args, **kwargs):
14 """Return a git command step.""" 14 """Return a git command step."""
15 name = kwargs.pop('name', 'git '+args[0]) 15 name = kwargs.pop('name', 'git '+args[0])
16 infra_step = kwargs.pop('infra_step', True) 16 infra_step = kwargs.pop('infra_step', True)
17 if 'cwd' not in kwargs: 17 if 'cwd' not in kwargs:
18 kwargs.setdefault('cwd', self.m.path['checkout']) 18 kwargs.setdefault('cwd', self.m.path['checkout'])
19 git_cmd = ['git'] 19 git_cmd = ['git']
20 if self.m.platform.is_win: 20 if self.m.platform.is_win:
21 git_cmd = [self.package_resource('git.bat')] 21 git_cmd = [self.m.path['depot_tools'].join('git.bat')]
22 options = kwargs.pop('git_config_options', {}) 22 options = kwargs.pop('git_config_options', {})
23 for k, v in sorted(options.iteritems()): 23 for k, v in sorted(options.iteritems()):
24 git_cmd.extend(['-c', '%s=%s' % (k, v)]) 24 git_cmd.extend(['-c', '%s=%s' % (k, v)])
25 can_fail_build = kwargs.pop('can_fail_build', True) 25 can_fail_build = kwargs.pop('can_fail_build', True)
26 try: 26 try:
27 return self.m.step(name, git_cmd + list(args), infra_step=infra_step, 27 return self.m.step(name, git_cmd + list(args), infra_step=infra_step,
28 **kwargs) 28 **kwargs)
29 except self.m.step.StepFailure as f: 29 except self.m.step.StepFailure as f:
30 if can_fail_build: 30 if can_fail_build:
31 raise 31 raise
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 self.m.path['checkout'] = dir_path 165 self.m.path['checkout'] = dir_path
166 166
167 git_setup_args = ['--path', dir_path, '--url', url] 167 git_setup_args = ['--path', dir_path, '--url', url]
168 168
169 if remote_name: 169 if remote_name:
170 git_setup_args += ['--remote', remote_name] 170 git_setup_args += ['--remote', remote_name]
171 else: 171 else:
172 remote_name = 'origin' 172 remote_name = 'origin'
173 173
174 if self.m.platform.is_win: 174 if self.m.platform.is_win:
175 git_setup_args += ['--git_cmd_path', self.package_resource('git.bat')] 175 git_setup_args += ['--git_cmd_path',
176 self.m.path['depot_tools'].join('git.bat')]
176 177
177 step_suffix = '' if step_suffix is None else ' (%s)' % step_suffix 178 step_suffix = '' if step_suffix is None else ' (%s)' % step_suffix
178 self.m.python( 179 self.m.python(
179 'git setup%s' % step_suffix, 180 'git setup%s' % step_suffix,
180 self.resource('git_setup.py'), 181 self.resource('git_setup.py'),
181 git_setup_args) 182 git_setup_args)
182 183
183 # There are five kinds of refs we can be handed: 184 # There are five kinds of refs we can be handed:
184 # 0) None. In this case, we default to properties['branch']. 185 # 0) None. In this case, we default to properties['branch'].
185 # 1) A 40-character SHA1 hash. 186 # 1) A 40-character SHA1 hash.
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 351
351 Args: 352 Args:
352 bundle_path (Path): The path of the output bundle. 353 bundle_path (Path): The path of the output bundle.
353 refs (list): The list of refs to include in the bundle. If None, all 354 refs (list): The list of refs to include in the bundle. If None, all
354 refs in the Git checkout will be bundled. 355 refs in the Git checkout will be bundled.
355 kwargs: Forwarded to '__call__'. 356 kwargs: Forwarded to '__call__'.
356 """ 357 """
357 if not rev_list_args: 358 if not rev_list_args:
358 rev_list_args = ['--all'] 359 rev_list_args = ['--all']
359 self('bundle', 'create', bundle_path, *rev_list_args, **kwargs) 360 self('bundle', 'create', bundle_path, *rev_list_args, **kwargs)
OLDNEW
« no previous file with comments | « no previous file | recipe_modules/git/example.expected/platform_win.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698