Commit f0b03783 authored by andybons's avatar andybons Committed by Commit bot

Remove gerrit_rebase_patch_ref flag from bot_update API

BUG=612417

Review-Url: https://codereview.chromium.org/2317213002
parent fbfa601e
...@@ -48,8 +48,7 @@ class BotUpdateApi(recipe_api.RecipeApi): ...@@ -48,8 +48,7 @@ class BotUpdateApi(recipe_api.RecipeApi):
# The below method will be removed after there are no more callers of # The below method will be removed after there are no more callers of
# tryserver.maybe_apply_issue (skbug.com/5588). # tryserver.maybe_apply_issue (skbug.com/5588).
def apply_gerrit_ref(self, root, gerrit_no_reset=False, def apply_gerrit_ref(self, root, gerrit_no_reset=False,
gerrit_no_rebase_patch_ref=False, gerrit_no_rebase_patch_ref=False, **kwargs):
gerrit_rebase_patch_ref=True, **kwargs):
apply_gerrit_path = self.resource('apply_gerrit.py') apply_gerrit_path = self.resource('apply_gerrit.py')
kwargs.setdefault('infra_step', True) kwargs.setdefault('infra_step', True)
kwargs.setdefault('env', {}).setdefault('PATH', '%(PATH)s') kwargs.setdefault('env', {}).setdefault('PATH', '%(PATH)s')
...@@ -62,7 +61,7 @@ class BotUpdateApi(recipe_api.RecipeApi): ...@@ -62,7 +61,7 @@ class BotUpdateApi(recipe_api.RecipeApi):
] ]
if gerrit_no_reset: if gerrit_no_reset:
cmd.append('--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') cmd.append('--gerrit_no_rebase_patch_ref')
return self.m.python('apply_gerrit', apply_gerrit_path, cmd, **kwargs) return self.m.python('apply_gerrit', apply_gerrit_path, cmd, **kwargs)
...@@ -74,8 +73,7 @@ class BotUpdateApi(recipe_api.RecipeApi): ...@@ -74,8 +73,7 @@ class BotUpdateApi(recipe_api.RecipeApi):
output_manifest=True, clobber=False, output_manifest=True, clobber=False,
root_solution_revision=None, rietveld=None, issue=None, root_solution_revision=None, rietveld=None, issue=None,
patchset=None, gerrit_no_reset=False, patchset=None, gerrit_no_reset=False,
gerrit_no_rebase_patch_ref=False, gerrit_no_rebase_patch_ref=False, **kwargs):
gerrit_rebase_patch_ref=True, **kwargs):
""" """
Args: Args:
use_site_config_creds: If the oauth2 credentials are in the buildbot use_site_config_creds: If the oauth2 credentials are in the buildbot
...@@ -226,7 +224,7 @@ class BotUpdateApi(recipe_api.RecipeApi): ...@@ -226,7 +224,7 @@ class BotUpdateApi(recipe_api.RecipeApi):
cmd.append('--with_branch_heads') cmd.append('--with_branch_heads')
if gerrit_no_reset: if gerrit_no_reset:
cmd.append('--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') cmd.append('--gerrit_no_rebase_patch_ref')
# Inject Json output for testing. # Inject Json output for testing.
......
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