From 8c5174b5276efa6375b3ff2f97ce2dab66ee335f Mon Sep 17 00:00:00 2001 From: Joanna Wang Date: Thu, 19 Jan 2023 00:07:48 +0000 Subject: [PATCH] Remove rietveld.cc to test removing all reitveld config sttuff. Bug:b/266001713 Change-Id: Ib5342e7519d7f7eaccf0a0a6f4a39c13677406bb Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4178919 Reviewed-by: Aravind Vasudevan Commit-Queue: Joanna Wang --- git_cl.py | 10 ++-------- tests/git_cl_test.py | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/git_cl.py b/git_cl.py index a1bbbeb39..47c52df73 100755 --- a/git_cl.py +++ b/git_cl.py @@ -807,9 +807,6 @@ class Settings(object): 'rietveld.run-post-upload-hook') return run_post_upload_hook == "True" - def GetDefaultCCList(self): - return self._GetConfig('rietveld.cc') - def GetUsePython3(self): return self._GetConfig('rietveld.use-python3') @@ -1066,9 +1063,7 @@ class Changelist(object): flag. """ if self.cc is None: - base_cc = settings.GetDefaultCCList() - more_cc = ','.join(self.more_cc) - self.cc = ','.join(filter(None, (base_cc, more_cc))) or '' + self.cc = ','.join(filter(None, self.more_cc)) or '' return self.cc def ExtendCC(self, more_cc): @@ -2538,7 +2533,7 @@ class Changelist(object): reviewers = sorted(change_desc.get_reviewers()) cc = [] - # Add CCs from WATCHLISTS and rietveld.cc git config unless this is + # Add CCs from WATCHLISTS and git config unless this is # the initial upload, the CL is private, or auto-CCing has ben disabled. if not (self.GetIssue() or options.private or options.no_autocc): cc = self.GetCCList().split(',') @@ -3202,7 +3197,6 @@ def LoadCodereviewSettingsFromFile(fileobj): SetProperty('server', 'CODE_REVIEW_SERVER') # Only server setting is required. Other settings can be absent. # In that case, we ignore errors raised during option deletion attempt. - SetProperty('cc', 'CC_LIST', unset_error_ok=True) SetProperty('tree-status-url', 'STATUS', unset_error_ok=True) SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True) SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True) diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py index 102e2451e..c1bf7940a 100755 --- a/tests/git_cl_test.py +++ b/tests/git_cl_test.py @@ -713,7 +713,6 @@ class TestGitCl(unittest.TestCase): def test_LoadCodereviewSettingsFromFile_gerrit(self): codereview_file = StringIO('GERRIT_HOST: true') self.calls = [ - ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1), ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1), ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1), ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),