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

Unified Diff: recipe_modules/bot_update/resources/bot_update.py

Issue 2298883002: Make rebase and sync the default for Gerrit updates (Closed)
Patch Set: . Created 4 years, 4 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 | « recipe_modules/bot_update/resources/apply_gerrit.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: recipe_modules/bot_update/resources/bot_update.py
diff --git a/recipe_modules/bot_update/resources/bot_update.py b/recipe_modules/bot_update/resources/bot_update.py
index d53320413ceaed04a7389d1a1bf321d0dda5bfea..fe8dd66ffd0a5eb78b2e218362730cccadc0b8ac 100755
--- a/recipe_modules/bot_update/resources/bot_update.py
+++ b/recipe_modules/bot_update/resources/bot_update.py
@@ -1414,8 +1414,8 @@ def parse_args():
parse.add_option('--gerrit_repo',
help='Gerrit repository to pull the ref from.')
parse.add_option('--gerrit_ref', help='Gerrit ref to apply.')
- parse.add_option('--gerrit_rebase_patch_ref', action='store_true',
- help='Rebase Gerrit patch ref after of checking it out.')
+ parse.add_option('--gerrit_no_rebase_patch_ref', action='store_true',
+ help='Bypass rebase of Gerrit patch ref after checkout.')
parse.add_option('--gerrit_no_reset', action='store_true',
help='Bypass calling reset after applying a gerrit ref.')
parse.add_option('--specs', help='Gcilent spec.')
@@ -1577,7 +1577,7 @@ def checkout(options, git_slns, specs, buildspec, master,
rietveld_server=options.rietveld_server,
gerrit_repo=options.gerrit_repo,
gerrit_ref=options.gerrit_ref,
- gerrit_rebase_patch_ref=options.gerrit_rebase_patch_ref,
+ gerrit_rebase_patch_ref=not options.gerrit_no_rebase_patch_ref,
revision_mapping=options.revision_mapping,
apply_issue_email_file=options.apply_issue_email_file,
apply_issue_key_file=options.apply_issue_key_file,
« no previous file with comments | « recipe_modules/bot_update/resources/apply_gerrit.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698