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>

tests/git_cl_test.py

diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index 29c88d5..3c58284 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -694,10 +694,6 @@
 
     calls = []
 
-    if squash_mode in ('override_squash', 'override_nosquash'):
-      self.mockGit.config['gerrit.override-squash-uploads'] = (
-          'true' if squash_mode == 'override_squash' else 'false')
-
     if not git_footers.get_footer_change_id(description) and not squash:
       calls += [
         (('DownloadGerritHook', False), ''),
@@ -1108,52 +1104,38 @@
         post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
         change_id='Ixxx')
 
-  def test_gerrit_upload_without_change_id_override_nosquash(self):
-    self._run_gerrit_upload_test(
-        [],
-        'desc ✔\n\nBUG=\n',
-        [],
-        squash=False,
-        squash_mode='override_nosquash',
-        post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
-        change_id='Ixxx')
-
   def test_gerrit_no_reviewer(self):
     self._run_gerrit_upload_test(
-        [],
+        ['--no-squash'],
         'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
         [],
         squash=False,
-        squash_mode='override_nosquash',
         change_id='I123456789')
 
   def test_gerrit_no_reviewer_non_chromium_host(self):
     # TODO(crbug/877717): remove this test case.
     self._run_gerrit_upload_test(
-        [],
+        ['--no-squash'],
         'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
         [],
         squash=False,
-        squash_mode='override_nosquash',
         short_hostname='other',
         change_id='I123456789')
 
   def test_gerrit_patchset_title_special_chars_nosquash(self):
     self._run_gerrit_upload_test(
-        ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
+        ['--no-squash', '-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
         'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
         squash=False,
-        squash_mode='override_nosquash',
         change_id='I123456789',
         title='We\'ll escape ^_ ^ special chars...@{u}')
 
   def test_gerrit_reviewers_cmd_line(self):
     self._run_gerrit_upload_test(
-        ['-r', 'foo@example.com', '--send-mail'],
+        ['--no-squash', '-r', 'foo@example.com', '--send-mail'],
         'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
         reviewers=['foo@example.com'],
         squash=False,
-        squash_mode='override_nosquash',
         notify=True,
         change_id='I123456789',
         final_description=(