From 210ed0ebfe37fb563012778dcb04cb5855c5fd51 Mon Sep 17 00:00:00 2001 From: Michael Moss Date: Thu, 28 Sep 2017 21:12:17 -0700 Subject: [PATCH] Expose new gclient.sync() arg in gclient.checkout(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit R=phajdan.jr@chromium.org Change-Id: I7313b8a26a5f2934e26491fc4b9403ba6cea0cee Reviewed-on: https://chromium-review.googlesource.com/691017 Reviewed-by: PaweÅ‚ Hajdan Jr. Commit-Queue: Michael Moss --- recipes/README.recipes.md | 12 ++++++------ recipes/recipe_modules/gclient/api.py | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 4b298edfc6..9d163812fb 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -222,12 +222,12 @@ Returns (Path): The "depot_tools" root directory. Wrapper for easy calling of gclient steps. -— **def [break\_locks](/recipes/recipe_modules/gclient/api.py#287)(self):** +— **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 reset, etc... we might end up with leftover index.lock files. -— **def [calculate\_patch\_root](/recipes/recipe_modules/gclient/api.py#309)(self, patch_project, gclient_config=None, patch_repo=None):** +— **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. @@ -246,7 +246,7 @@ Returns: If patch_project is not given or not recognized, it'll be just first solution root. -— **def [checkout](/recipes/recipe_modules/gclient/api.py#235)(self, gclient_config=None, revert=RevertOnTryserver, inject_parent_got_revision=True, \*\*kwargs):** +— **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. @@ -272,7 +272,7 @@ Args: override (bool) - If True, will forcibly set revision and custom_vars even if the config already contains values for them. -  **@property**
— **def [is\_blink\_mode](/recipes/recipe_modules/gclient/api.py#274)(self):** +  **@property**
— **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 Chromium config. This may happen for one of two reasons: @@ -283,9 +283,9 @@ Chromium config. This may happen for one of two reasons: — **def [resolve\_revision](/recipes/recipe_modules/gclient/api.py#147)(self, revision):** -— **def [runhooks](/recipes/recipe_modules/gclient/api.py#268)(self, args=None, name='runhooks', \*\*kwargs):** +— **def [runhooks](/recipes/recipe_modules/gclient/api.py#269)(self, args=None, name='runhooks', \*\*kwargs):** -— **def [set\_patch\_project\_revision](/recipes/recipe_modules/gclient/api.py#341)(self, patch_project, gclient_config=None):** +— **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. diff --git a/recipes/recipe_modules/gclient/api.py b/recipes/recipe_modules/gclient/api.py index 9aa1c4279f..38db8a8a59 100644 --- a/recipes/recipe_modules/gclient/api.py +++ b/recipes/recipe_modules/gclient/api.py @@ -233,7 +233,8 @@ class GclientApi(recipe_api.RecipeApi): cfg.solutions[0].custom_vars[custom_var] = val 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.""" cfg = gclient_config or self.c assert cfg.complete() @@ -248,7 +249,7 @@ class GclientApi(recipe_api.RecipeApi): sync_step = None try: - sync_step = self.sync(cfg, **kwargs) + sync_step = self.sync(cfg, extra_sync_flags=extra_sync_flags, **kwargs) cfg_cmds = [ ('user.name', 'local_bot'),