From fd8560139886ad21c77dfab004fd61e7b5e3c054 Mon Sep 17 00:00:00 2001 From: Ben Pastene Date: Tue, 11 Jun 2024 23:08:59 +0000 Subject: [PATCH] git_cl: Remove support for '--clobber' arg The chromium recipe (and only the chromium recipe?) currently reads this prop to trigger a clobber build. But support for that in the recipe is being removed in https://crrev.com/c/5620860. So this removes the ability to set that arg via `git cl try`. Across all chrome/chromium builders, that arg was only passed in six builds in the past year. So it's very unlikely anyone depends on it, or will notice it's gone. Bug: 346363294 Change-Id: Icf05c9a2fd6f2e9239c735e4c5507aee9a26e0e5 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5620634 Reviewed-by: Josip Sokcevic Commit-Queue: Ben Pastene --- git_cl.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/git_cl.py b/git_cl.py index ffbdcd65b..6a9c653b8 100755 --- a/git_cl.py +++ b/git_cl.py @@ -406,8 +406,6 @@ def _make_tryjob_schedule_requests(changelist, jobs, options, patchset): shared_properties = { 'category': options.ensure_value('category', 'git_cl_try') } - if options.ensure_value('clobber', False): - shared_properties['clobber'] = True shared_properties.update(_get_properties_from_options(options) or {}) shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}] @@ -2319,7 +2317,7 @@ class Changelist(object): if not force: confirm_or_exit(msg, action='continue') else: - DieWithError(msg) + DieWithError(msg) def EnsureCanUploadPatchset(self, force): if not self.GetIssue(): @@ -5723,13 +5721,6 @@ def CMDtry(parser, args): help='Revision to use for the tryjob; default: the revision will ' 'be determined by the try recipe that builder runs, which usually ' 'defaults to HEAD of origin/master or origin/main') - group.add_option( - '-c', - '--clobber', - action='store_true', - default=False, - help='Force a clobber before building; that is don\'t do an ' - 'incremental build') group.add_option('--category', default='git_cl_try', help='Specify custom build category.')