From 8effa4d0637c83d2e8cd5869c90ced50cdf3c099 Mon Sep 17 00:00:00 2001 From: Andrii Shyshkalov Date: Tue, 21 Jan 2020 13:23:36 +0000 Subject: [PATCH] git cl: warn when landing on chromium/src branch-heads. Undos a hack added while CQ for branches was experimental. R=ehmaldonado Bug: 1043225, 753213 Change-Id: Ie88b61e61f59e828f0ac4a36cf4e356700305482 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2011308 Auto-Submit: Andrii Shyshkalov Commit-Queue: Edward Lesmes Reviewed-by: Edward Lesmes --- git_cl.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/git_cl.py b/git_cl.py index 337ed3e6e..a04a6a950 100755 --- a/git_cl.py +++ b/git_cl.py @@ -2088,14 +2088,7 @@ class Changelist(object): def _IsCqConfigured(self): detail = self._GetChangeDetail(['LABELS']) - if u'Commit-Queue' not in detail.get('labels', {}): - return False - # TODO(crbug/753213): Remove temporary hack - if ('https://chromium.googlesource.com/chromium/src' == - self.GetRemoteUrl() and - detail['branch'].startswith('refs/branch-heads/')): - return False - return True + return u'Commit-Queue' in detail.get('labels', {}) def CMDLand(self, force, bypass_hooks, verbose, parallel): if git_common.is_dirty_git_tree('land'):