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

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

Issue 1918903003: Revert of bot_update: call gclient sync after checking out a gerrit ref (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Created 4 years, 8 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/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 b8b3f0060b9d43d87a88e47faec705accd20852c..df60837d5e4ae606a00cfc9199c66bf121ae8198 100755
--- a/recipe_modules/bot_update/resources/bot_update.py
+++ b/recipe_modules/bot_update/resources/bot_update.py
@@ -1338,8 +1338,8 @@
# Let gclient do the DEPS syncing.
# The branch-head refspec is a special case because its possible Chrome
# src, which contains the branch-head refspecs, is DEPSed in.
- with_branch_heads = (buildspec or BRANCH_HEADS_REFSPEC in refs)
- gclient_output = gclient_sync(with_branch_heads, shallow)
+ gclient_output = gclient_sync(buildspec or BRANCH_HEADS_REFSPEC in refs,
+ shallow)
# Now that gclient_sync has finished, we should revert any .DEPS.git so that
# presubmit doesn't complain about it being modified.
@@ -1366,7 +1366,6 @@
apply_issue_key_file, blacklist=already_patched)
elif gerrit_ref:
apply_gerrit_ref(gerrit_repo, gerrit_ref, patch_root, gerrit_reset)
- gclient_sync(with_branch_heads, shallow)
# Reset the deps_file point in the solutions so that hooks get run properly.
for sln in solutions:
« 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