Enroll everyone in stacked changes dogfood.
Bug: b/265929888
Change-Id: Ib084e306a23a6159b8d5fe4b45bf9af731514665
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4482418
Commit-Queue: Joanna Wang <jojwang@chromium.org>
Reviewed-by: Gavin Mak <gavinmak@google.com>
diff --git a/git_cl.py b/git_cl.py
index 9d003f8..d0b4e6f 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -167,14 +167,6 @@
DOGFOOD_STACKED_CHANGES_VAR = 'DOGFOOD_STACKED_CHANGES'
-# Repo prefixes that are enrolled in the stacked changes dogfood.
-DOGFOOD_STACKED_CHANGES_REPOS = [
- 'chromium.googlesource.com/infra/',
- 'chrome-internal.googlesource.com/infra/'
- 'chromium.googlesource.com/chromium/src'
-]
-
-
class GitPushError(Exception):
pass
@@ -4817,19 +4809,14 @@
print('No previous patchsets, so --retry-failed has no effect.')
options.retry_failed = False
- remote = cl.GetRemoteUrl()
- dogfood_stacked_changes = (os.environ.get(DOGFOOD_STACKED_CHANGES_VAR)
- not in ['1', '0']
- and any(repo in remote
- for repo in DOGFOOD_STACKED_CHANGES_REPOS))
+ dogfood_stacked_changes = os.environ.get(DOGFOOD_STACKED_CHANGES_VAR) != '0'
if dogfood_stacked_changes:
print('This repo has been enrolled in the stacked changes dogfood. '
'To opt-out use `export DOGFOOD_STACKED_CHANGES=0`. '
- 'File bugs at https://bit.ly/3Y6opoI')
+ 'File bugs at https://bit.ly/3Y6opoI\n')
- if options.squash and (dogfood_stacked_changes
- or os.environ.get(DOGFOOD_STACKED_CHANGES_VAR) == '1'):
+ if options.squash and dogfood_stacked_changes:
print('Depot Tools no longer sets new uploads to "WIP". Please update the\n'
'"Set new changes to "work in progress" by default" checkbox at\n'
'https://<host>-review.googlesource.com/settings/')