Index: git_cl.py |
diff --git a/git_cl.py b/git_cl.py |
index ab28a9ca159f041251fbe9023363750e5363f3f4..fbf6c49fbf2c427d7f92b9f61613cec3e8ef36d4 100755 |
--- a/git_cl.py |
+++ b/git_cl.py |
@@ -2241,6 +2241,13 @@ 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, ' |
agable
2016/06/21 16:43:54
"This repository has..."
No need to be wishy-wash
tandrii(chromium)
2016/06/21 17:33:29
ChromeOS folks defined Commit-Queue label in All P
tandrii(chromium)
2016/07/25 09:39:32
and you did the cleanup, and this it still is "see
|
+ 'which can test and land changes for you. \n' |
agable
2016/06/21 16:43:54
"...land changes for you. Are you sure you wish to
tandrii(chromium)
2016/06/21 17:33:29
Done.
|
+ 'Press Enter to continue, Ctrl+C to abort.') |
+ |
differs = True |
last_upload = RunGit(['config', |
'branch.%s.gerritsquashhash' % self.GetBranch()], |
@@ -2249,7 +2256,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: |