commit 31a538a3a9e45202471c7eb0b2bd11c039a78f0a
author Mike Frysinger <vapier@chromium.org> Tue May 05 18:38:51 2020 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue May 05 18:38:51 2020 +0000
tree a43c42ca1a3cecaea1bcbc2c8d599e9f6c9c6163
parent fbe690fdb4662faa8af3fbfdf62fd98489309114

git-cl: turn GERRIT_SQUASH_UPLOADS into a warning

Now that repos have dropped this from their codereview.settings file,
change this logic to issue a warning if it's ever seen again.

Drop checking local gerrit.override-squash-uploads config too since
it's no longer relevant.

Bug: 993518
Change-Id: Id91bbc94b0890ca21c51a274f6acc41f2ae19b78
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1756159
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>

git_cl.py

diff --git a/git_cl.py b/git_cl.py
index 8bb03fc..58d7b90 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -767,26 +767,11 @@
   def GetSquashGerritUploads(self):
     """Returns True if uploads to Gerrit should be squashed by default."""
     if self.squash_gerrit_uploads is None:
-      self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
-    if self.squash_gerrit_uploads is None:
       # Default is squash now (http://crbug.com/611892#c23).
       self.squash_gerrit_uploads = self._GetConfig(
           'gerrit.squash-uploads').lower() != 'false'
     return self.squash_gerrit_uploads
 
-  def GetSquashGerritUploadsOverride(self):
-    """Return True or False if codereview.settings should be overridden.
-
-    Returns None if no override has been defined.
-    """
-    # See also http://crbug.com/611892#c23
-    result = self._GetConfig('gerrit.override-squash-uploads').lower()
-    if result == 'true':
-      return True
-    if result == 'false':
-      return False
-    return None
-
   def GetGerritSkipEnsureAuthenticated(self):
     """Return True if EnsureAuthenticated should not be done for Gerrit
     uploads."""
@@ -2755,8 +2740,8 @@
     RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
 
   if 'GERRIT_SQUASH_UPLOADS' in keyvals:
-    RunGit(['config', 'gerrit.squash-uploads',
-            keyvals['GERRIT_SQUASH_UPLOADS']])
+    print('WARNING: GERRIT_SQUASH_UPLOADS in codereview.settings is no longer '
+          'supported.  Please delete it and update your ~/.gitconfig instead.')
 
   if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
     RunGit(['config', 'gerrit.skip-ensure-authenticated',