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

Unified Diff: git_cl.py

Issue 2089683002: Gerrit git cl land: add warning if Commit-Queue label exists. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: review Created 4 years, 6 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: git_cl.py
diff --git a/git_cl.py b/git_cl.py
index ab28a9ca159f041251fbe9023363750e5363f3f4..189c61f92f7b0e57f8d3d87f7a8bbca67bd267ec 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -2241,6 +2241,14 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
def CMDLand(self, force, bypass_hooks, verbose):
if git_common.is_dirty_git_tree('land'):
return 1
+ detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
+ if u'Commit-Queue' in detail.get('labels', {}):
+ if not force:
+ ask_for_data('\nIt seems this repository has a Commit Queue, '
+ 'which can test and land changes for you. '
+ 'Are you sure you wish to bypass it?\n'
+ 'Press Enter to continue, Ctrl+C to abort.')
+
differs = True
last_upload = RunGit(['config',
'branch.%s.gerritsquashhash' % self.GetBranch()],
@@ -2249,7 +2257,6 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
if not last_upload or RunGit(['diff', last_upload]).strip():
print('WARNING: some changes from local branch haven\'t been uploaded')
else:
- detail = self._GetChangeDetail(['CURRENT_REVISION'])
if detail['current_revision'] == last_upload:
differs = False
else:
« 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