From f0b0378318a0bca451dc05303ba3c0971b249103 Mon Sep 17 00:00:00 2001 From: andybons Date: Wed, 7 Sep 2016 12:00:58 -0700 Subject: [PATCH] Remove gerrit_rebase_patch_ref flag from bot_update API BUG=612417 Review-Url: https://codereview.chromium.org/2317213002 --- recipe_modules/bot_update/api.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/recipe_modules/bot_update/api.py b/recipe_modules/bot_update/api.py index 456722890..32117394d 100644 --- a/recipe_modules/bot_update/api.py +++ b/recipe_modules/bot_update/api.py @@ -48,8 +48,7 @@ class BotUpdateApi(recipe_api.RecipeApi): # The below method will be removed after there are no more callers of # tryserver.maybe_apply_issue (skbug.com/5588). def apply_gerrit_ref(self, root, gerrit_no_reset=False, - gerrit_no_rebase_patch_ref=False, - gerrit_rebase_patch_ref=True, **kwargs): + gerrit_no_rebase_patch_ref=False, **kwargs): apply_gerrit_path = self.resource('apply_gerrit.py') kwargs.setdefault('infra_step', True) kwargs.setdefault('env', {}).setdefault('PATH', '%(PATH)s') @@ -62,7 +61,7 @@ class BotUpdateApi(recipe_api.RecipeApi): ] if gerrit_no_reset: cmd.append('--gerrit_no_reset') - if gerrit_no_rebase_patch_ref or not gerrit_rebase_patch_ref: + if gerrit_no_rebase_patch_ref: cmd.append('--gerrit_no_rebase_patch_ref') return self.m.python('apply_gerrit', apply_gerrit_path, cmd, **kwargs) @@ -74,8 +73,7 @@ class BotUpdateApi(recipe_api.RecipeApi): output_manifest=True, clobber=False, root_solution_revision=None, rietveld=None, issue=None, patchset=None, gerrit_no_reset=False, - gerrit_no_rebase_patch_ref=False, - gerrit_rebase_patch_ref=True, **kwargs): + gerrit_no_rebase_patch_ref=False, **kwargs): """ Args: use_site_config_creds: If the oauth2 credentials are in the buildbot @@ -226,7 +224,7 @@ class BotUpdateApi(recipe_api.RecipeApi): cmd.append('--with_branch_heads') if gerrit_no_reset: cmd.append('--gerrit_no_reset') - if gerrit_no_rebase_patch_ref or not gerrit_rebase_patch_ref: + if gerrit_no_rebase_patch_ref: cmd.append('--gerrit_no_rebase_patch_ref') # Inject Json output for testing.