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

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

Issue 2181743003: Reland "Remove all safesync functionality from gclient" Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Introduce the fix Created 4 years, 4 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 | « recipe_modules/bot_update/resources/bot_update.py ('k') | recipe_modules/gclient/config.py » ('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 from recipe_engine import recipe_api 5 from recipe_engine import recipe_api
6 6
7 7
8 class RevisionResolver(object): 8 class RevisionResolver(object):
9 """Resolves the revision based on build properties.""" 9 """Resolves the revision based on build properties."""
10 10
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 126
127 def resolve_revision(self, revision): 127 def resolve_revision(self, revision):
128 if hasattr(revision, 'resolve'): 128 if hasattr(revision, 'resolve'):
129 return revision.resolve(self.m.properties) 129 return revision.resolve(self.m.properties)
130 return revision 130 return revision
131 131
132 def sync(self, cfg, with_branch_heads=False, **kwargs): 132 def sync(self, cfg, with_branch_heads=False, **kwargs):
133 revisions = [] 133 revisions = []
134 self.set_patch_project_revision(self.m.properties.get('patch_project'), cfg) 134 self.set_patch_project_revision(self.m.properties.get('patch_project'), cfg)
135 for i, s in enumerate(cfg.solutions): 135 for i, s in enumerate(cfg.solutions):
136 if s.safesync_url: # prefer safesync_url in gclient mode
137 continue
138 if i == 0 and s.revision is None: 136 if i == 0 and s.revision is None:
139 s.revision = RevisionFallbackChain() 137 s.revision = RevisionFallbackChain()
140 138
141 if s.revision is not None and s.revision != '': 139 if s.revision is not None and s.revision != '':
142 fixed_revision = self.resolve_revision(s.revision) 140 fixed_revision = self.resolve_revision(s.revision)
143 if fixed_revision: 141 if fixed_revision:
144 revisions.extend(['--revision', '%s@%s' % (s.name, fixed_revision)]) 142 revisions.extend(['--revision', '%s@%s' % (s.name, fixed_revision)])
145 143
146 for name, revision in sorted(cfg.revisions.items()): 144 for name, revision in sorted(cfg.revisions.items()):
147 fixed_revision = self.resolve_revision(revision) 145 fixed_revision = self.resolve_revision(revision)
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 """Updates config revision corresponding to patch_project. 351 """Updates config revision corresponding to patch_project.
354 352
355 Useful for bot_update only, as this is the only consumer of gclient's config 353 Useful for bot_update only, as this is the only consumer of gclient's config
356 revision map. This doesn't overwrite the revision if it was already set. 354 revision map. This doesn't overwrite the revision if it was already set.
357 """ 355 """
358 assert patch_project is None or isinstance(patch_project, basestring) 356 assert patch_project is None or isinstance(patch_project, basestring)
359 cfg = gclient_config or self.c 357 cfg = gclient_config or self.c
360 path, revision = cfg.patch_projects.get(patch_project, (None, None)) 358 path, revision = cfg.patch_projects.get(patch_project, (None, None))
361 if path and revision and path not in cfg.revisions: 359 if path and revision and path not in cfg.revisions:
362 cfg.revisions[path] = revision 360 cfg.revisions[path] = revision
OLDNEW
« no previous file with comments | « recipe_modules/bot_update/resources/bot_update.py ('k') | recipe_modules/gclient/config.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698