Commit 210ed0eb authored by Michael Moss's avatar Michael Moss Committed by Commit Bot

Expose new gclient.sync() arg in gclient.checkout().

R=phajdan.jr@chromium.org

Change-Id: I7313b8a26a5f2934e26491fc4b9403ba6cea0cee
Reviewed-on: https://chromium-review.googlesource.com/691017Reviewed-by: 's avatarPaweł Hajdan Jr. <phajdan.jr@chromium.org>
Commit-Queue: Michael Moss <mmoss@chromium.org>
parent f3b4f060
...@@ -222,12 +222,12 @@ Returns (Path): The "depot_tools" root directory. ...@@ -222,12 +222,12 @@ Returns (Path): The "depot_tools" root directory.
Wrapper for easy calling of gclient steps. Wrapper for easy calling of gclient steps.
&mdash; **def [break\_locks](/recipes/recipe_modules/gclient/api.py#287)(self):** &mdash; **def [break\_locks](/recipes/recipe_modules/gclient/api.py#288)(self):**
Remove all index.lock files. If a previous run of git crashed, bot was Remove all index.lock files. If a previous run of git crashed, bot was
reset, etc... we might end up with leftover index.lock files. reset, etc... we might end up with leftover index.lock files.
&mdash; **def [calculate\_patch\_root](/recipes/recipe_modules/gclient/api.py#309)(self, patch_project, gclient_config=None, patch_repo=None):** &mdash; **def [calculate\_patch\_root](/recipes/recipe_modules/gclient/api.py#310)(self, patch_project, gclient_config=None, patch_repo=None):**
Returns path where a patch should be applied to based patch_project. Returns path where a patch should be applied to based patch_project.
...@@ -246,7 +246,7 @@ Returns: ...@@ -246,7 +246,7 @@ Returns:
If patch_project is not given or not recognized, it'll be just first If patch_project is not given or not recognized, it'll be just first
solution root. solution root.
&mdash; **def [checkout](/recipes/recipe_modules/gclient/api.py#235)(self, gclient_config=None, revert=RevertOnTryserver, inject_parent_got_revision=True, \*\*kwargs):** &mdash; **def [checkout](/recipes/recipe_modules/gclient/api.py#235)(self, gclient_config=None, revert=RevertOnTryserver, inject_parent_got_revision=True, extra_sync_flags=None, \*\*kwargs):**
Return a step generator function for gclient checkouts. Return a step generator function for gclient checkouts.
...@@ -272,7 +272,7 @@ Args: ...@@ -272,7 +272,7 @@ Args:
override (bool) - If True, will forcibly set revision and custom_vars override (bool) - If True, will forcibly set revision and custom_vars
even if the config already contains values for them. even if the config already contains values for them.
&emsp; **@property**<br>&mdash; **def [is\_blink\_mode](/recipes/recipe_modules/gclient/api.py#274)(self):** &emsp; **@property**<br>&mdash; **def [is\_blink\_mode](/recipes/recipe_modules/gclient/api.py#275)(self):**
Indicates wether the caller is to use the Blink config rather than the Indicates wether the caller is to use the Blink config rather than the
Chromium config. This may happen for one of two reasons: Chromium config. This may happen for one of two reasons:
...@@ -283,9 +283,9 @@ Chromium config. This may happen for one of two reasons: ...@@ -283,9 +283,9 @@ Chromium config. This may happen for one of two reasons:
&mdash; **def [resolve\_revision](/recipes/recipe_modules/gclient/api.py#147)(self, revision):** &mdash; **def [resolve\_revision](/recipes/recipe_modules/gclient/api.py#147)(self, revision):**
&mdash; **def [runhooks](/recipes/recipe_modules/gclient/api.py#268)(self, args=None, name='runhooks', \*\*kwargs):** &mdash; **def [runhooks](/recipes/recipe_modules/gclient/api.py#269)(self, args=None, name='runhooks', \*\*kwargs):**
&mdash; **def [set\_patch\_project\_revision](/recipes/recipe_modules/gclient/api.py#341)(self, patch_project, gclient_config=None):** &mdash; **def [set\_patch\_project\_revision](/recipes/recipe_modules/gclient/api.py#342)(self, patch_project, gclient_config=None):**
Updates config revision corresponding to patch_project. Updates config revision corresponding to patch_project.
......
...@@ -233,7 +233,8 @@ class GclientApi(recipe_api.RecipeApi): ...@@ -233,7 +233,8 @@ class GclientApi(recipe_api.RecipeApi):
cfg.solutions[0].custom_vars[custom_var] = val cfg.solutions[0].custom_vars[custom_var] = val
def checkout(self, gclient_config=None, revert=RevertOnTryserver, def checkout(self, gclient_config=None, revert=RevertOnTryserver,
inject_parent_got_revision=True, **kwargs): inject_parent_got_revision=True, extra_sync_flags=None,
**kwargs):
"""Return a step generator function for gclient checkouts.""" """Return a step generator function for gclient checkouts."""
cfg = gclient_config or self.c cfg = gclient_config or self.c
assert cfg.complete() assert cfg.complete()
...@@ -248,7 +249,7 @@ class GclientApi(recipe_api.RecipeApi): ...@@ -248,7 +249,7 @@ class GclientApi(recipe_api.RecipeApi):
sync_step = None sync_step = None
try: try:
sync_step = self.sync(cfg, **kwargs) sync_step = self.sync(cfg, extra_sync_flags=extra_sync_flags, **kwargs)
cfg_cmds = [ cfg_cmds = [
('user.name', 'local_bot'), ('user.name', 'local_bot'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment