git-cl: Better warning message for legacy buckets.
Bug: 976104
Change-Id: Ide06f73faf7a9ce6aa2d7f47deffc0c505dcdb14
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1835017
Auto-Submit: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@google.com>
Reviewed-by: Anthony Polito <apolito@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
diff --git a/git_cl.py b/git_cl.py
index 30088cc..7c0b703 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -423,19 +423,23 @@
'Please specify the bucket, e.g. "-B luci.chromium.try".')
-def _parse_bucket(bucket):
- if '/' in bucket:
- return tuple(bucket.split('/', 1))
- # Legacy buckets.
- print('WARNING Please specify buckets as <project>/<bucket>.')
+def _parse_bucket(raw_bucket):
+ legacy = True
+ project = bucket = None
+ if '/' in raw_bucket:
+ legacy = False
+ project, bucket = raw_bucket.split('/', 1)
# Assume luci.<project>.<bucket>.
- if bucket.startswith('luci.'):
- return tuple(bucket[len('luci.'):].split('.', 1))
+ elif raw_bucket.startswith('luci.'):
+ project, bucket = raw_bucket[len('luci.'):].split('.', 1)
# Otherwise, assume prefix is also the project name.
- if '.' in bucket:
- project = bucket.split('.')[0]
- return project, bucket
- return None, None
+ elif '.' in raw_bucket:
+ project = raw_bucket.split('.')[0]
+ bucket = raw_bucket
+ # Legacy buckets.
+ if legacy:
+ print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
+ return project, bucket
def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset):