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

Unified Diff: recipe_modules/bot_update/api.py

Issue 2317213002: Remove gerrit_rebase_patch_ref flag from bot_update API (Closed)
Patch Set: Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: recipe_modules/bot_update/api.py
diff --git a/recipe_modules/bot_update/api.py b/recipe_modules/bot_update/api.py
index d88d929938bcbbc954d9e835c5c8eca5f8b6ed02..a3060fbf9588aa152136a882c8b6699b52e1abf4 100644
--- a/recipe_modules/bot_update/api.py
+++ b/recipe_modules/bot_update/api.py
@@ -50,8 +50,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')
@@ -64,7 +63,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)
@@ -76,8 +75,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
@@ -233,7 +231,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.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698